diff --git a/tests/frontends/mpd/audio_output_test.py b/tests/frontends/mpd/audio_output_test.py
deleted file mode 100644
index 82d9e203..00000000
--- a/tests/frontends/mpd/audio_output_test.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import unittest
-
-from mopidy.backends.dummy import DummyBackend
-from mopidy.frontends.mpd.dispatcher import MpdDispatcher
-from mopidy.mixers.dummy import DummyMixer
-
-class AudioOutputHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.backend = DummyBackend.start().proxy()
-        self.mixer = DummyMixer.start().proxy()
-        self.dispatcher = MpdDispatcher()
-
-    def tearDown(self):
-        self.backend.stop().get()
-        self.mixer.stop().get()
-
-    def test_enableoutput(self):
-        result = self.dispatcher.handle_request(u'enableoutput "0"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_disableoutput(self):
-        result = self.dispatcher.handle_request(u'disableoutput "0"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_outputs(self):
-        result = self.dispatcher.handle_request(u'outputs')
-        self.assert_(u'outputid: 0' in result)
-        self.assert_(u'outputname: None' in result)
-        self.assert_(u'outputenabled: 1' in result)
-        self.assert_(u'OK' in result)
diff --git a/tests/frontends/mpd/protocol/audio_output_test.py b/tests/frontends/mpd/protocol/audio_output_test.py
new file mode 100644
index 00000000..f9374159
--- /dev/null
+++ b/tests/frontends/mpd/protocol/audio_output_test.py
@@ -0,0 +1,17 @@
+from tests.frontends.mpd import protocol
+
+class AudioOutputHandlerTest(protocol.BaseTestCase):
+    def test_enableoutput(self):
+        self.sendRequest(u'enableoutput "0"')
+        self.assertInResponse(u'ACK [0@0] {} Not implemented')
+
+    def test_disableoutput(self):
+        self.sendRequest(u'disableoutput "0"')
+        self.assertInResponse(u'ACK [0@0] {} Not implemented')
+
+    def test_outputs(self):
+        self.sendRequest(u'outputs')
+        self.assertInResponse(u'outputid: 0')
+        self.assertInResponse(u'outputname: None')
+        self.assertInResponse(u'outputenabled: 1')
+        self.assertInResponse(u'OK')