diff --git a/t/Macro/GroupAdd.t b/t/Macro/GroupAdd.t
index bc64c7931..101fb1e31 100644
--- a/t/Macro/GroupAdd.t
+++ b/t/Macro/GroupAdd.t
@@ -156,13 +156,13 @@ sub setupTest {
 	$groups[1] = WebGUI::Group->new($session, "new");
 	$groups[1]->name('Regular Old Group');
 	$groups[1]->autoAdd(0);
-    WebGUI::Test->groupsToDelete(@{ $groups });
+    WebGUI::Test->groupsToDelete(@groups);
 
 	##Three users.  One in each group and one with no group membership
 	my @users = map { WebGUI::User->new($session, "new") } 0..2;
 	$users[0]->addToGroups([$groups[0]->getId]);
 	$users[1]->addToGroups([$groups[1]->getId]);
-    WebGUI::Test->usersToDelete(@{ $users });
+    WebGUI::Test->usersToDelete(@users);
 
 	my $versionTag = WebGUI::VersionTag->getWorking($session);
 	$versionTag->set({name=>"GroupAdd test"});
@@ -202,12 +202,6 @@ sub simpleTextParser {
 }
 
 END { ##Clean-up after yourself, always
-	foreach my $testGroup (@{ $groups }, ) {
-		$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
-	}
-	foreach my $dude (@{ $users }, ) {
-		$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
-	}
 	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
 		$versionTag->rollback;
 	}
diff --git a/t/Macro/GroupDelete.t b/t/Macro/GroupDelete.t
index 30e0f69bc..64d5aad47 100644
--- a/t/Macro/GroupDelete.t
+++ b/t/Macro/GroupDelete.t
@@ -156,11 +156,13 @@ sub setupTest {
 	$groups[1] = WebGUI::Group->new($session, "new");
 	$groups[1]->name('Regular Old Group');
 	$groups[1]->autoDelete(0);
+    WebGUI::Test->groupsToDelete(@groups);
 
 	##Three users.  One in each group and one with no group membership
 	my @users = map { WebGUI::User->new($session, "new") } 0..2;
 	$users[0]->addToGroups([$groups[0]->getId]);
 	$users[1]->addToGroups([$groups[1]->getId]);
+    WebGUI::Test->usersToDelete(@users);
 
 	my $versionTag = WebGUI::VersionTag->getWorking($session);
 	$versionTag->set({name=>"GroupDelete test"});
@@ -200,12 +202,6 @@ sub simpleTextParser {
 }
 
 END { ##Clean-up after yourself, always
-	foreach my $testGroup (@{ $groups }, ) {
-		$testGroup->delete if (defined $testGroup and ref $testGroup eq 'WebGUI::Group');
-	}
-	foreach my $dude (@{ $users }, ) {
-		$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
-	}
 	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
 		$versionTag->rollback;
 	}