diff --git a/tests/mpd/handlertest.py b/tests/mpd/handlertest.py
index 7eee480f..b5b93998 100644
--- a/tests/mpd/handlertest.py
+++ b/tests/mpd/handlertest.py
@@ -876,14 +876,26 @@ class MusicDatabaseHandlerTest(unittest.TestCase):
         result = self.h.handle_request(u'find "album" "what"')
         self.assert_(u'OK' in result)
 
+    def test_find_album_without_quotes(self):
+        result = self.h.handle_request(u'find album "what"')
+        self.assert_(u'OK' in result)
+
     def test_find_artist(self):
         result = self.h.handle_request(u'find "artist" "what"')
         self.assert_(u'OK' in result)
 
+    def test_find_artist_without_quotes(self):
+        result = self.h.handle_request(u'find artist "what"')
+        self.assert_(u'OK' in result)
+
     def test_find_title(self):
         result = self.h.handle_request(u'find "title" "what"')
         self.assert_(u'OK' in result)
 
+    def test_find_title_without_quotes(self):
+        result = self.h.handle_request(u'find title "what"')
+        self.assert_(u'OK' in result)
+
     def test_find_else_should_fail(self):
         try:
             result = self.h.handle_request(u'find "somethingelse" "what"')
@@ -940,18 +952,42 @@ class MusicDatabaseHandlerTest(unittest.TestCase):
         result = self.h.handle_request(u'search "album" "analbum"')
         self.assert_(u'OK' in result)
 
+    def test_search_album_without_quotes(self):
+        result = self.h.handle_request(u'search album "analbum"')
+        self.assert_(u'OK' in result)
+
     def test_search_artist(self):
         result = self.h.handle_request(u'search "artist" "anartist"')
         self.assert_(u'OK' in result)
 
+    def test_search_artist_without_quotes(self):
+        result = self.h.handle_request(u'search artist "anartist"')
+        self.assert_(u'OK' in result)
+
     def test_search_filename(self):
         result = self.h.handle_request(u'search "filename" "afilename"')
         self.assert_(u'OK' in result)
 
+    def test_search_filename_without_quotes(self):
+        result = self.h.handle_request(u'search filename "afilename"')
+        self.assert_(u'OK' in result)
+
     def test_search_title(self):
         result = self.h.handle_request(u'search "title" "atitle"')
         self.assert_(u'OK' in result)
 
+    def test_search_title_without_quotes(self):
+        result = self.h.handle_request(u'search title "atitle"')
+        self.assert_(u'OK' in result)
+
+    def test_search_any(self):
+        result = self.h.handle_request(u'search "any" "anything"')
+        self.assert_(u'OK' in result)
+
+    def test_search_any_without_quotes(self):
+        result = self.h.handle_request(u'search any "anything"')
+        self.assert_(u'OK' in result)
+
     def test_search_else_should_fail(self):
         try:
             result = self.h.handle_request(u'search "sometype" "something"')