diff --git a/test/bug.818.t b/test/bug.818.t
deleted file mode 100755
index 19159e52d..000000000
--- a/test/bug.818.t
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python2.7
-# -*- coding: utf-8 -*-
-###############################################################################
-#
-# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# http://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-import sys
-import os
-import unittest
-# Ensure python finds the local simpletap module
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import Task, TestCase
-
-
-class TestBug818(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_tag_filter_partial_match(self):
-        """Filtering by tag counter-intuitively uses partial match"""
-        self.t("add +hannah +anna one")
-        code, out, err = self.t("+anna list")
-        self.assertIn("one", out)
-
-        self.t("add +anna +hannah two")
-        code, out, err = self.t("+anna list")
-        self.assertIn("one", out)
-
-        code, out, err = self.t("+hannah list")
-        self.assertIn("two", out)
-
-        self.t("add +hannah three")
-        self.t("add +anna four")
-        code, out, err = self.t("+anna list")
-        self.assertIn("one", out)
-        self.assertIn("two", out)
-        self.assertNotIn("three", out)
-        self.assertIn("four", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tag.t b/test/tag.t
index 9513c7577..7d97a712c 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -416,32 +416,32 @@ class Test285(TestCase):
         cls.t('add due_next_year     due:1year')
 
     def test_overdue(self):
-        """+OVERDUE"""
+        """285: +OVERDUE"""
         code, out, err = self.t("+OVERDUE count")
         self.assertEqual(out, "3\n", "+OVERDUE == 3 tasks")
 
     def test_yesterday(self):
-        """+YESTERDAY"""
+        """285: +YESTERDAY"""
         code, out, err = self.t("+YESTERDAY count")
         self.assertEqual(out, "1\n", "+YESTERDAY == 1 task")
 
     def test_due(self):
-        """+DUE"""
+        """285: +DUE"""
         code, out, err = self.t("+DUE count")
         self.assertEqual(out, "3\n", "+DUE == 3 task")
 
     def test_today(self):
-        """+TODAY"""
+        """285: +TODAY"""
         code, out, err = self.t("+TODAY count")
         self.assertEqual(out, "1\n", "+TODAY == 1 task")
 
     def test_duetoday(self):
-        """+DUETODAY"""
+        """285: +DUETODAY"""
         code, out, err = self.t("+DUETODAY count")
         self.assertEqual(out, "1\n", "+DUETODAY == 1 task")
 
     def test_tomorrow(self):
-        """+TOMORROW"""
+        """285: +TOMORROW"""
         code, out, err = self.t("+TOMORROW count")
         self.assertEqual(out, "1\n", "+TOMORROW == 1 task")
 
@@ -493,7 +493,7 @@ class TestBug1700(TestCase):
         self.t = Task()
 
     def test_tags_overwrite(self):
-        """Verify that 'tags:a,b' overwrites existing tags."""
+        """1700: Verify that 'tags:a,b' overwrites existing tags."""
         self.t("add +tag1 +tag2 one")
         code, out, err = self.t("_get 1.tags")
         self.assertIn("tag1,tag2", out)
@@ -504,6 +504,32 @@ class TestBug1700(TestCase):
         self.assertNotIn("tag1", out)
         self.assertIn("tag2,tag3", out)
 
+class TestBug818(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_tag_filter_partial_match(self):
+        """818: Filtering by tag counter-intuitively uses partial match"""
+        self.t("add +hannah +anna one")
+        code, out, err = self.t("+anna list")
+        self.assertIn("one", out)
+
+        self.t("add +anna +hannah two")
+        code, out, err = self.t("+anna list")
+        self.assertIn("one", out)
+
+        code, out, err = self.t("+hannah list")
+        self.assertIn("two", out)
+
+        self.t("add +hannah three")
+        self.t("add +anna four")
+        code, out, err = self.t("+anna list")
+        self.assertIn("one", out)
+        self.assertIn("two", out)
+        self.assertNotIn("three", out)
+        self.assertIn("four", out)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner