diff --git a/test/abbreviation.t b/test/abbreviation.t
index 3efa2bc16..098f6f3a8 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -133,6 +133,30 @@ class TestBug1006(TestCase):
         self.assertIn("entrée interdite", out, msg=errormsg)
 
 
+class TestBug1687(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_som(self):
+        """1687: The named date 'som' should take precedence over 'someday', for an exact match"""
+        self.t("rc.abbreviation.minimum=2 add one due:som")
+        code, out, err = self.t("_get 1.due.year")
+        self.assertNotEqual("2038\n", out)
+
+        self.t("rc.abbreviation.minimum=3 add two due:som")
+        code, out, err = self.t("_get 2.due.year")
+        self.assertNotEqual("2038\n", out)
+
+        self.t("rc.abbreviation.minimum=4 add three due:som")
+        code, out, err = self.t("_get 3.due.year")
+        self.assertNotEqual("2038\n", out)
+
+        self.t("rc.abbreviation.minimum=4 add three due:some")
+        code, out, err = self.t("_get 4.due.year")
+        self.assertEqual("2038\n", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
diff --git a/test/tw-1687.t b/test/tw-1687.t
deleted file mode 100755
index 9667117dd..000000000
--- a/test/tw-1687.t
+++ /dev/null
@@ -1,67 +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
-from basetest import Taskd, ServerTestCase
-
-
-class TestBug1687(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_som(self):
-        """The named date 'som' should take precedence over 'someday', for an exact match"""
-        self.t("rc.abbreviation.minimum=2 add one due:som")
-        code, out, err = self.t("_get 1.due.year")
-        self.assertNotEqual("2038\n", out)
-
-        self.t("rc.abbreviation.minimum=3 add two due:som")
-        code, out, err = self.t("_get 2.due.year")
-        self.assertNotEqual("2038\n", out)
-
-        self.t("rc.abbreviation.minimum=4 add three due:som")
-        code, out, err = self.t("_get 3.due.year")
-        self.assertNotEqual("2038\n", out)
-
-        self.t("rc.abbreviation.minimum=4 add three due:some")
-        code, out, err = self.t("_get 4.due.year")
-        self.assertEqual("2038\n", out)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python