diff --git a/tests/lib/SimpleSAML/Locale/LanguageTest.php b/tests/lib/SimpleSAML/Locale/LanguageTest.php
index 68aee869a6ebec46d8a8f887d53afb5e15bb1a7d..d6e6c815ed8a61b0d56499f4fc5e4fa55347fb34 100644
--- a/tests/lib/SimpleSAML/Locale/LanguageTest.php
+++ b/tests/lib/SimpleSAML/Locale/LanguageTest.php
@@ -47,11 +47,36 @@ class LanguageTest extends \PHPUnit_Framework_TestCase
             'language.available' => array('xx', 'yy', 'zz'),
             'language.cookie.name' => 'xyz'
         ), '', 'simplesaml');
-        $_COOKIE['xyz'] = 'yy';
+        $_COOKIE['xyz'] = 'Yy'; // test values are converted to lowercase too
         $this->assertEquals('yy', Language::getLanguageCookie());
     }
 
 
+    /**
+     * Test SimpleSAML\Locale\Language::getLanguageList().
+     */
+    public function testGetLanguageList()
+    {
+        // test defaults
+        $c = \SimpleSAML_Configuration::loadFromArray(array(), '', 'simplesaml');
+        $l = new Language($c);
+        $l->setLanguage('en');
+        $this->assertEquals(array('en' => true), $l->getLanguageList());
+
+        // test non-defaults
+        $c = \SimpleSAML_Configuration::loadFromArray(array(
+            'language.available' => array('xx', 'yy', 'zz'),
+        ), '', 'simplesaml');
+        $l = new Language($c);
+        $l->setLanguage('yy');
+        $this->assertEquals(array(
+            'xx' => false,
+            'yy' => true,
+            'zz' => false,
+        ), $l->getLanguageList());
+    }
+
+
     /**
      * Test SimpleSAML\Locale\Language::getLanguageParameterName().
      */