diff --git a/test/upgrade.t b/test/upgrade.t
index 728cfdff4..df061f14c 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -1,62 +1,66 @@
-#! /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 => 5;
+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
 
-# Create the rc file.
-if (open my $fh, '>', 'upgrade.rc')
-{
-  print $fh "data.location=.\n",
-            "confirmation=off\n";
-  close $fh;
-}
 
-# Add a plain task, then upgrade to recurring, test for correctness.
-qx{../src/task rc:upgrade.rc add one 2>&1};
-my $output = qx{../src/task rc:upgrade.rc 1 info 2>&1};
-like ($output, qr/Status\s+Pending/,   'Plain task entered');
+class TestUpgrade(TestCase):
+    def setUp(self):
+        self.t = Task()
 
-qx{../src/task rc:upgrade.rc 1 modify due:tomorrow recur:weekly 2>&1};
-qx{../src/task rc:upgrade.rc list 2>&1};
-$output = qx{../src/task rc:upgrade.rc 1 info 2>&1};
-like ($output, qr/Status\s+Recurring/, 'Upgraded parent: good status');
-like ($output, qr/Recurrence\s+weekly/,   'Upgraded parent: good recurrence');
+    def test_upgrade_to_recurring(self):
+        """Upgrade a task to recurring"""
+        self.t(("add", "one"))
 
-$output = qx{../src/task rc:upgrade.rc 2 info 2>&1};
-like ($output, qr/Status\s+Pending/,   'Upgraded child: good status');
-like ($output, qr/Recurrence\s+weekly/,   'Upgraded child: good recurrence');
+        code, out, err = self.t(("1", "info"))
+        self.assertRegexpMatches(out, "Status\s+Pending")
 
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data upgrade.rc);
-exit 0;
+        self.t(("1", "modify", "due:tomorrow", "recur:weekly"))
+        self.t(("list",))
 
+        code, out, err = self.t(("1", "info"))
+        self.assertRegexpMatches(out, "Status\s+Recurring")
+        self.assertRegexpMatches(out, "Recurrence\s+weekly")
+
+        # Also check for the presence of a children task with pending state
+        code, out, err = self.t(("2", "info"))
+        self.assertRegexpMatches(out, "Status\s+Pending")
+        self.assertRegexpMatches(out, "Recurrence\s+weekly")
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4