diff --git a/test/bug.1031.t b/test/bug.1031.t
index c3aea00ad..958d19162 100755
--- a/test/bug.1031.t
+++ b/test/bug.1031.t
@@ -1,65 +1,75 @@
-#! /usr/bin/env perl
-################################################################################
-##
-## 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
-##
-################################################################################
+#!/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
+#
+###############################################################################
 
-use strict;
-use warnings;
-use Test::More tests => 3;
+import sys
+import os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
+from basetest import Task, TestCase
 
-use File::Basename;
-my $ut = basename ($0);
-my $rc = $ut . '.rc';
 
-# Create the rc file.
-if (open my $fh, '>', $rc)
-{
-  print $fh "data.location=.\n",
-            "alias.from=to\n";
-  close $fh;
-}
+class TestBug1031(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        # Used to initialize objects that should be re-initialized or
+        # re-created for each individual test
+        self.t = Task()
 
-# Bug 1031: -- does not bypass aliasing
-qx{../src/task rc:$rc add from 2>&1};
-qx{../src/task rc:$rc add from -- to 2>&1};
-qx{../src/task rc:$rc add to -- from 2>&1};
+        self.t.config("alias.from", "to")
 
-my $output = qx{../src/task rc:$rc 1 info 2>&1};
-like ($output, qr/Description\s+to$/ms, "$ut: 'from' --> 'to'");
+    def test_alias_to(self):
+        """alias working as expected: 'from' -> 'to'"""
+        self.t(("add", "from"))
+        code, out, err = self.t(("1", "info"))
 
-$output = qx{../src/task rc:$rc 2 info 2>&1};
-like ($output, qr/Description\s+to to$/ms, "$ut: 'from -- to' --> 'to to'");
+        expected = "Description\s+to"
+        self.assertRegexpMatches(out, expected)
 
-$output = qx{../src/task rc:$rc 3 info 2>&1};
-like ($output, qr/Description\s+to from$/ms, "$ut: 'to -- from' --> 'to from'");
+    def test_alias_to_to(self):
+        """alias working as expected: 'from -- to' -> 'to to'"""
+        self.t(("add", "from", "--", "to"))
+        code, out, err = self.t(("1", "info"))
 
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
+        expected = "Description\s+to to"
+        self.assertRegexpMatches(out, expected)
 
+    def test_alias_to_from(self):
+        """alias working as expected: 'to -- from' -> 'to from'"""
+        self.t(("add", "to", "--", "from"))
+        code, out, err = self.t(("1", "info"))
+
+        expected = "Description\s+to from"
+        self.assertRegexpMatches(out, expected)
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4