diff --git a/test/bug.uuid.t b/test/bug.uuid.t
deleted file mode 100755
index bc4d189e5..000000000
--- a/test/bug.uuid.t
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /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
-##
-################################################################################
-
-use strict;
-use warnings;
-use Test::More tests => 3;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-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=no\n";
-  close $fh;
-}
-
-# Add a task, dup it, add a recurring task, list.  Then make sure they all have
-# unique UUID values.
-qx{../src/task rc:$rc add simple 2>&1};
-qx{../src/task rc:$rc 1 duplicate 2>&1};
-qx{../src/task rc:$rc add periodic recur:daily due:yesterday 2>&1};
-qx{../src/task rc:$rc ls 2>&1};
-
-my @all_uuids;
-my %unique_uuids;
-my $output = qx{../src/task rc:$rc 1 info 2>&1};
-my ($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-$output = qx{../src/task rc:$rc 2 info 2>&1};
-($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-$output = qx{../src/task rc:$rc 3 info 2>&1};
-($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-$output = qx{../src/task rc:$rc 4 info 2>&1};
-($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-$output = qx{../src/task rc:$rc 5 info 2>&1};
-($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-$output = qx{../src/task rc:$rc 6 info 2>&1};
-($uuid) = $output =~ /UUID\s+(\S+)/;
-push @all_uuids, $uuid;
-$unique_uuids{$uuid} = undef;
-
-is (scalar (@all_uuids),         6, "$ut: 6 tasks created");
-is (scalar (keys %unique_uuids), 6, "$ut: 6 unique UUIDs");
-
-$output = qx{../src/task rc:$rc diag 2>&1};
-like ($output, qr/No duplicates found/, "$ut: No duplicate UUIDs detected");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/uuid.t b/test/uuid.t
index c2f63e57e..8b1f3ddb4 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -152,6 +152,29 @@ class TestUUID(TestCase):
         self.assertIn('"description":"seven"', out)
 
 
+class TestUUIDuplicates(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_uuid_duplicates(self):
+        """Verify that duplicating tasks, and recurring tasks do no create duplicates UUIDs"""
+        self.t("add simple")
+        self.t("1 duplicate")
+        self.t("add periodic recur:daily due:yesterday")
+        self.t("list") # GC/handleRecurrence
+
+        uuids = list()
+        for id in range(1,7):
+            code, out, err = self.t("_get %d.uuid" % id)
+            uuids.append(out.strip())
+
+        self.assertEqual(len(uuids), len(set(uuids)))
+
+        code, out, err = self.t("diag")
+        self.assertIn("No duplicates found", out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())