diff --git a/test/bug.1254.t b/test/bug.1254.t
deleted file mode 100755
index af0ff6c8c..000000000
--- a/test/bug.1254.t
+++ /dev/null
@@ -1,71 +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 signal
-import unittest
-# Ensure python finds the local simpletap and basetest modules
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from basetest import Task, TestCase
-
-
-class TestBug1254(TestCase):
-    def setUp(self):
-        self.t = Task()
-
-    def test_no_segmentation_fault_calc_negative_multiplication(self):
-        """calc can multiply zero and negative numbers
-        """
-        self.run_command("calc 0*-1")
-
-    def test_calc_positive_multiplication(self):
-        """calc can multiply negative zero and positive
-        """
-        self.run_command("calc 0*1")
-
-    def run_command(self, args):
-        code, out, err = self.t(args)
-
-        # We shouldn't get a segmentation fault
-        # (negative exit code == 128 - real_exit_code)
-        expected = -signal.SIGSEGV
-        self.assertNotEqual(expected, code, "Task segfaulted")
-
-        # Instead we expect a clean exit
-        expected = 0
-        self.assertEqual(expected, code,
-                         "Exit code was non-zero ({0})".format(code))
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/calc.t b/test/calc.t
index b7d186c32..f282b4728 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -29,11 +29,12 @@
 import sys
 import os
 import re
+import signal
 import unittest
 # Ensure python finds the local simpletap module
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from basetest import TestCase
+from basetest import Task, TestCase
 from basetest.utils import BIN_PREFIX, run_cmd_wait, run_cmd_wait_nofail
 
 CALC = os.path.join(BIN_PREFIX, "calc")
@@ -105,6 +106,33 @@ class TestCalc(TestCase):
         self.assertRegexpMatches(out, re.compile("^PT15M$", re.MULTILINE))
 
 
+class TestBug1254(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def run_command(self, args):
+        code, out, err = self.t(args)
+
+        # We should not see a segmentation fault
+        # (negative exit code == 128 - real_exit_code)
+        expected = -signal.SIGSEGV
+        self.assertNotEqual(expected, code, "Task segfaulted")
+
+        # Instead we expect a clean exit
+        expected = 0
+        self.assertEqual(expected, code, "Exit code was non-zero ({0})".format(code))
+
+    def test_no_segmentation_fault_calc_negative_multiplication(self):
+        """1254: calc can multiply zero and negative numbers
+        """
+        self.run_command("calc 0*-1")
+
+    def test_calc_positive_multiplication(self):
+        """1254: calc can multiply negative zero and positive
+        """
+        self.run_command("calc 0*1")
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())