diff --git a/test/tw-1418.t b/test/tw-1418.t
index 252076ce1..27c0e39b5 100755
--- a/test/tw-1418.t
+++ b/test/tw-1418.t
@@ -15,17 +15,18 @@ class Test1418(TestCase):
     def setUp(self):
         self.t = Task()
 
+    # Helper methods
     def search_task_pattern(self, description):
         # TODO escape any "/" in description - check comments on bug 1418
         command = ("/" + description + "/",)
         code, out, err = self.t(command)
         self.assertIn(description, out)
 
-    def search_task_bare(self, description):
-        # TODO escape any "/" in description - check comments on bug 1418
-        command = (description,)
-        code, out, err = self.t(command)
-        self.assertIn(description, out)
+#    def search_task_bare(self, description):
+#        # TODO escape any "/" in description - check comments on bug 1418
+#        command = (description,)
+#        code, out, err = self.t(command)
+#        self.assertIn(description, out)
 
     def add_search_task(self, description):
         command = ("add", description)
@@ -35,81 +36,80 @@ class Test1418(TestCase):
         command = ("add", "description:'" + description + "'")
         code, out, err = self.t(command)
 
-    def test_slash_in_description_bare_words(self):
-        """Check that you can search with a slash (/) and bare words"""
-        description = "foo/"
-        self.add_search_task(description)
-        self.search_task_bare(description)
+    # Tests
+#    def test_slash_in_description_bare_words(self):
+#        """Check that you can search with a slash (/) and bare words"""
+#        description = "foo/"
+#        self.add_search_task(description)
+#        self.search_task_bare(description)
 
-    def test_minus_in_description_bare_words(self):
-        """Check that you can search with a minus (-) and bare words"""
-        description = "foo-"
-        self.add_search_task(description)
-        self.search_task_bare(description)
+#    def test_minus_in_description_bare_words(self):
+#        """Check that you can search with a minus (-) and bare words"""
+#        description = "foo-"
+#        self.add_search_task(description)
+#        self.search_task_bare(description)
 
-    def test_plus_in_description_bare_words(self):
-        """Check that you can search with a plus (+) and bare words"""
-        description = "foo+"
-        self.add_search_task(description)
-        self.search_task_bare(description)
+#    def test_plus_in_description_bare_words(self):
+#        """Check that you can search with a plus (+) and bare words"""
+#        description = "foo+"
+#        self.add_search_task(description)
+#        self.search_task_bare(description)
 
-    def test_explicit_slash_in_description_bare_words(self):
-        """Can add a task with trailing slash (/) using description:"" and bare
-        words
-        """
-        description = "foo/"
-        self.add_search_task_description(description)
-        self.search_task_bare(description)
+#    def test_explicit_slash_in_description_bare_words(self):
+#        """Can add a task with trailing slash (/) using description:"" and bare
+#        words
+#        """
+#        description = "foo/"
+#        self.add_search_task_description(description)
+#        self.search_task_bare(description)
 
-    def test_explicit_minus_in_description_bare_words(self):
-        """Can add a task with trailing minus (-) using description:"" and bare
-        words
-        """
-        description = "foo-"
-        self.add_search_task_description(description)
-        self.search_task_bare(description)
+#    def test_explicit_minus_in_description_bare_words(self):
+#        """Can add a task with trailing minus (-) using description:"" and bare
+#        words
+#        """
+#        description = "foo-"
+#        self.add_search_task_description(description)
+#        self.search_task_bare(description)
 
-    def test_explicit_plus_in_description_bare_words(self):
-        """Can add a task with trailing plus (+) using description:"" and bare
-        words
-        """
-        description = "foo+"
-        self.add_search_task_description(description)
-        self.search_task_bare(description)
+#    def test_explicit_plus_in_description_bare_words(self):
+#        """Can add a task with trailing plus (+) using description:"" and bare
+#        words
+#        """
+#        description = "foo+"
+#        self.add_search_task_description(description)
+#        self.search_task_bare(description)
 
     def test_slash_in_description(self):
         """Check that you can search with a slash (/)"""
-        description = "foo/"
+        description = "foo\\/"
         self.add_search_task(description)
         self.search_task_pattern(description)
 
     def test_minus_in_description(self):
         """Check that you can search with a minus (-)"""
-        description = "foo-"
-        self.add_search_task(description)
-        self.search_task_pattern(description)
+        self.add_search_task("foo-")
+        self.search_task_pattern("foo\\-")
 
     def test_plus_in_description(self):
         """Check that you can search with a plus (+)"""
-        description = "foo+"
+        description = "foo\\+"
         self.add_search_task(description)
         self.search_task_pattern(description)
 
     def test_explicit_slash_in_description(self):
         """Can add a task with trailing slash (/) using description:"" """
-        description = "foo/"
+        description = "foo\\/"
         self.add_search_task_description(description)
         self.search_task_pattern(description)
 
     def test_explicit_minus_in_description(self):
         """Can add a task with trailing minus (-) using description:"" """
-        description = "foo-"
-        self.add_search_task_description(description)
-        self.search_task_pattern(description)
+        self.add_search_task_description("foo-")
+        self.search_task_pattern("foo\\-")
 
     def test_explicit_plus_in_description(self):
         """Can add a task with trailing plus (+) using description:"" """
-        description = "foo+"
+        description = "foo\\+"
         self.add_search_task_description(description)
         self.search_task_pattern(description)