diff --git a/test/add.t b/test/add.t
index 1f64be47d..2f268ec2e 100755
--- a/test/add.t
+++ b/test/add.t
@@ -1,68 +1,72 @@
-#! /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 => 7;
+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
+from basetest.utils import UUID_regex
 
-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",
-            "confirmation=off\n";
-  close $fh;
-}
+class TestAdd(TestCase):
+    def setUp(self):
+        self.t = Task()
+        self.t(("add", "This is a test"))
 
-# Test the add command.
-qx{../src/task rc:$rc add This is a test 2>&1};
-my $output = qx{../src/task rc:$rc info 1 2>&1};
-like ($output, qr/ID\s+1\n/,                       "$ut: add ID");
-like ($output, qr/Description\s+This is a test\n/, "$ut: add ID");
-like ($output, qr/Status\s+Pending\n/,             "$ut: add Pending");
-like ($output, qr/UUID\s+[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\n/,
-                                                   "$ut: add UUID");
+    def test_add(self):
+        "Testing add command"
 
-# Test the /// modifier.
-qx{../src/task rc:$rc 1 modify /test/TEST/ 2>&1};
-qx{../src/task rc:$rc 1 modify "/is //" 2>&1};
-$output = qx{../src/task rc:$rc info 1 2>&1};
-like ($output, qr/ID\s+1\n/,                       "$ut: add ID");
-like ($output, qr/Status\s+Pending\n/,             "$ut: add Pending");
-like ($output, qr/Description\s+This a TEST\n/,    "$ut: add Description");
+        code, out, err = self.t(("info", "1"))
 
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
+        self.assertRegexpMatches(out, "ID\s+1\n")
+        self.assertRegexpMatches(out, "Description\s+This is a test\n")
+        self.assertRegexpMatches(out, "Status\s+Pending\n")
+        self.assertRegexpMatches(out, "UUID\s+" + UUID_regex + "\n")
 
+    def test_modify_slash(self):
+        "Test the /// modifier"
+
+        self.t(("1", "modify", "/test/TEST/"))
+        self.t(("1", "modify", "/is //"))
+
+        code, out, err = self.t(("info", "1"))
+
+        self.assertRegexpMatches(out, "ID\s+1\n")
+        self.assertRegexpMatches(out, "Status\s+Pending\n")
+        self.assertRegexpMatches(out, "Description\s+This a TEST\n")
+        self.assertRegexpMatches(out, "UUID\s+" + UUID_regex + "\n")
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4
diff --git a/test/basetest/utils.py b/test/basetest/utils.py
index 8458268f8..b261d5c95 100644
--- a/test/basetest/utils.py
+++ b/test/basetest/utils.py
@@ -43,6 +43,8 @@ TASKD_SKIP = os.environ.get("TASKD_SKIP", False)
 # Environment flags to control use of PATH or in-tree binaries
 USE_PATH = os.environ.get("USE_PATH", False)
 
+UUID_regex = ("[0-9A-Fa-f]{8}-" + ("[0-9A-Fa-f]{4}-" * 3) + "[0-9A-Fa-f]{12}")
+
 
 def binary_location(cmd):
     """If USE_PATH is set rely on PATH to look for task/taskd binaries.