diff --git a/tests/unit/Grav/Common/ComposerTest.php b/tests/unit/Grav/Common/ComposerTest.php
new file mode 100644
index 000000000..4823c377c
--- /dev/null
+++ b/tests/unit/Grav/Common/ComposerTest.php
@@ -0,0 +1,38 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Composer;
+
+class ComposerTest extends \Codeception\TestCase\Test
+{
+    /**
+     * @var \UnitTester
+     */
+    protected $tester;
+
+    protected function _before()
+    {
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testGetComposerLocation()
+    {
+        $composerLocation = Composer::getComposerLocation();
+        $this->assertTrue(is_string($composerLocation));
+        $this->assertTrue($composerLocation[0] == '/');
+    }
+
+    public function testGetComposerExecutor()
+    {
+        $composerExecutor = Composer::getComposerExecutor();
+        $this->assertTrue(is_string($composerExecutor));
+        $this->assertTrue($composerExecutor[0] == '/');
+        $this->assertTrue(strstr($composerExecutor, 'php') !== null);
+        $this->assertTrue(strstr($composerExecutor, 'composer') !== null);
+    }
+
+}
+