diff --git a/tests/lib/SimpleSAML/Utils/ConfigTest.php b/tests/lib/SimpleSAML/Utils/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..556e5d0b0d659af15cacc36e29d6c7b6115e9f17
--- /dev/null
+++ b/tests/lib/SimpleSAML/Utils/ConfigTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Tests for SimpleSAML\Utils\Config
+ */
+class Utils_ConfigTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test default config dir with not environment variable
+     */
+    public function testDefaultConfigDir()
+    {
+        // clear env var
+        putenv('SIMPLESAMLPHP_CONFIG_DIR');
+        $configDir = \SimpleSAML\Utils\Config::getConfigDir();
+
+        $this->assertEquals($configDir, dirname(dirname(dirname(dirname(__DIR__)))) . '/config');
+    }
+
+    /**
+     * Test valid dir specified by env var overrides default config dir
+     */
+    public function testEnvVariableConfigDir()
+    {
+        putenv('SIMPLESAMLPHP_CONFIG_DIR=' . __DIR__);
+        $configDir = \SimpleSAML\Utils\Config::getConfigDir();
+
+        $this->assertEquals($configDir, __DIR__);
+    }
+
+    /**
+     * Test invalid dir specified by env var results in a thrown exception
+     */
+    public function testInvalidEnvVariableConfigDirThrowsException()
+    {
+        // I used a random hash to ensure this test directory is always invalid
+        $invalidDir = __DIR__ . '/e9826ad19cbc4f5bf20c0913ffcd2ce6';
+        putenv('SIMPLESAMLPHP_CONFIG_DIR=' . $invalidDir);
+
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            'Config directory specified by environment variable SIMPLESAMLPHP_CONFIG_DIR is not a directory.  ' .
+            'Given: "' . $invalidDir . '"'
+        );
+
+        $configDir = \SimpleSAML\Utils\Config::getConfigDir();
+    }
+}