diff --git a/whipper/test/test_common_config.py b/whipper/test/test_common_config.py
index 26035fb..74f19a0 100644
--- a/whipper/test/test_common_config.py
+++ b/whipper/test/test_common_config.py
@@ -66,3 +66,26 @@ class ConfigTestCase(tcommon.TestCase):
         defeats = self._config.getDefeatsCache(
             'PLEXTOR ', 'DVDR   PX-L890SA', '1.05')
         self.assertEquals(defeats, True)
+
+    def test_get_musicbrainz_server(self):
+        self.assertEquals(self._config.get_musicbrainz_server(),
+                          'musicbrainz.org',
+                          msg='Default value is correct')
+
+        self._config._parser.add_section('musicbrainz')
+
+        self._config._parser.set('musicbrainz', 'server',
+                                 '192.168.2.141:5000')
+        self._config.write()
+        self.assertEquals(self._config.get_musicbrainz_server(),
+                          '192.168.2.141:5000',
+                          msg='Correctly returns user-set value')
+
+        self._config._parser.set('musicbrainz', 'server',
+                                 '192.168.2.141:5000/hello/world')
+        self._config.write()
+        self.assertEquals(self._config.get_musicbrainz_server(),
+                          '192.168.2.141:5000',
+                          msg='Correctly strips out path after port number')
+
+        self._config._parser.remove_section('musicbrainz')