diff --git a/test/bug.886.t b/test/bug.886.t
deleted file mode 100755
index 920954f31..000000000
--- a/test/bug.886.t
+++ /dev/null
@@ -1,60 +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 TestBug886(TestCase):
-
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_invalid_day(self):
-        """Test invalid day synonym
-
-           Bug 886: tw doesn't warn the user if, e.g., a weekday cannot be resolved properly
-        """
-        code, out, err =self.t("add one due:sun")
-        self.assertIn("Created task 1.", out)
-
-        code, out, err =self.t.runError("add two due:donkey")
-        self.assertIn("'donkey' is not a valid date", err)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/dateformat.t b/test/dateformat.t
index be9640ab3..d59ab0708 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -56,6 +56,23 @@ class TestDateformat(TestCase):
         code, out, err = self.t("xxx rc.dateformat:YMDTHNS")
         self.assertEqual(out.count("20150704T000000"), 3)
 
+class TestBug886(TestCase):
+
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_invalid_day(self):
+        """886: Test invalid day synonym
+
+           Bug 886: tw doesn't warn the user if, e.g., a weekday cannot be resolved properly
+        """
+        code, out, err =self.t("add one due:sun")
+        self.assertIn("Created task 1.", out)
+
+        code, out, err =self.t.runError("add two due:donkey")
+        self.assertIn("'donkey' is not a valid date", err)
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner