diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/BasicTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/BasicTest.php
index ae322204cbdfdbd3800dd16577c50de5c62b372b..52f6cf83ca68adc6a2311ccedf2a007805a5f564 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/BasicTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/BasicTest.php
@@ -79,4 +79,30 @@ class BasicTest extends \VuFindTest\Unit\MinkTestCase
             $this->findCss($page, '.location')->getText()
         );
     }
+
+    /**
+     * Test language switching by checking a link in the footer
+     *
+     * @return void
+     */
+    public function testLanguage()
+    {
+        $session = $this->getMinkSession();
+        $session->visit($this->getVuFindUrl() . '/Search/Home');
+        $page = $session->getPage();
+        // Check footer help-link
+        $this->assertEquals(
+            'Search Tips',
+            $this->findCss($page, 'footer .help-link')->getHTML()
+        );
+        // Change the language:
+        $this->findCss($page, '.language.dropdown')->click();
+        $this->findCss($page, '.language.dropdown li:not(.active) a')->click();
+        $this->snooze();
+        // Check footer help-link
+        $this->assertNotEquals(
+            'Search Tips',
+            $this->findCss($page, 'footer .help-link')->getHTML()
+        );
+    }
 }
diff --git a/themes/bootstrap3/templates/header.phtml b/themes/bootstrap3/templates/header.phtml
index 4dac97c846f13804688b1669876e2b412ebabd9b..51e4b28db07289fe261e327f29e5b1168d3bfe6e 100644
--- a/themes/bootstrap3/templates/header.phtml
+++ b/themes/bootstrap3/templates/header.phtml
@@ -42,7 +42,7 @@
         <? endif; ?>
 
         <? if (isset($this->layout()->themeOptions) && count($this->layout()->themeOptions) > 1): ?>
-          <li class="dropdown">
+          <li class="theme dropdown">
             <form method="post" name="themeForm" id="themeForm">
               <input type="hidden" name="ui"/>
             </form>
@@ -56,7 +56,7 @@
         <? endif; ?>
 
         <? if (isset($this->layout()->allLangs) && count($this->layout()->allLangs) > 1): ?>
-          <li class="dropdown">
+          <li class="language dropdown">
             <form method="post" name="langForm" id="langForm">
               <input type="hidden" name="mylang"/>
             </form>