diff --git a/t/Asset/Wobject/Collaboration/permission.t b/t/Asset/Wobject/Collaboration/permission.t
index c65e05d50..87f24ea98 100644
--- a/t/Asset/Wobject/Collaboration/permission.t
+++ b/t/Asset/Wobject/Collaboration/permission.t
@@ -31,6 +31,7 @@ my $node            = WebGUI::Asset->getImportNode( $session );
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
+WebGUI::Test->usersToDelete($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );
@@ -108,8 +109,5 @@ $maker->prepare( {
 #----------------------------------------------------------------------------
 # Cleanup
 END {
-    for my $user ( values %user ) {
-        $user->delete;
-    }
     $versionTag->rollback;
 }
diff --git a/t/Asset/Wobject/Gallery/permission.t b/t/Asset/Wobject/Gallery/permission.t
index 8d8922add..4b039c334 100644
--- a/t/Asset/Wobject/Gallery/permission.t
+++ b/t/Asset/Wobject/Gallery/permission.t
@@ -29,6 +29,7 @@ my $maker           = WebGUI::Test::Maker::Permission->new;
 my $gallery;
 
 my $nonAdmin    = WebGUI::User->new( $session, "new" );
+WebGUI::Test->usersToDelete($nonAdmin);
 
 
 #----------------------------------------------------------------------------
@@ -79,5 +80,4 @@ $maker->run;
 # Cleanup
 END {
     $versionTag->rollback;
-    $nonAdmin->delete;
 }
diff --git a/t/Asset/Wobject/GalleryAlbum/edit.t b/t/Asset/Wobject/GalleryAlbum/edit.t
index 11d76a337..1d6ddf475 100644
--- a/t/Asset/Wobject/GalleryAlbum/edit.t
+++ b/t/Asset/Wobject/GalleryAlbum/edit.t
@@ -35,6 +35,7 @@ $session->setting->set( 'specialState', '' );
 
 # Create a user for testing purposes
 my $user        = WebGUI::User->new( $session, "new" );
+WebGUI::Test->usersToDelete($user);
 $user->username( 'dufresne' . time );
 my $identifier  = 'ritahayworth';
 my $auth        = WebGUI::Operation::Auth::getInstance( $session, $user->authMethod, $user->userId );
@@ -115,8 +116,6 @@ END {
     for my $tag ( @versionTags ) {
         $tag->rollback;
     }
-
-    $user->delete;
 }
 
 #----------------------------------------------------------------------------
diff --git a/t/Asset/Wobject/GalleryAlbum/permission.t b/t/Asset/Wobject/GalleryAlbum/permission.t
index 6529f9da7..2ae6a5750 100644
--- a/t/Asset/Wobject/GalleryAlbum/permission.t
+++ b/t/Asset/Wobject/GalleryAlbum/permission.t
@@ -28,6 +28,7 @@ my $node            = WebGUI::Asset->getImportNode($session);
 my %user;
 $user{"2"}          = WebGUI::User->new( $session, "new" );
 $user{"2"}->addToGroups( ['2'] ); # Registered user
+WebGUI::Test->usersToDelete($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Album Test"});
@@ -108,6 +109,5 @@ $maker->run;
 # Cleanup
 END {
     $versionTag->rollback();
-    $user{"2"}->delete;
 }
 
diff --git a/t/Asset/Wobject/Survey.t b/t/Asset/Wobject/Survey.t
index 4ce46246c..0fc38ad23 100644
--- a/t/Asset/Wobject/Survey.t
+++ b/t/Asset/Wobject/Survey.t
@@ -31,6 +31,7 @@ SKIP: {
 
 skip $tests, "Unable to load Survey" unless $usedOk;
 $user = WebGUI::User->new( $session, 'new' );
+WebGUI::Test->usersToDelete($user);
 $import_node = WebGUI::Asset->getImportNode($session);
 
 # Create a Survey
@@ -118,7 +119,6 @@ ok($s->responseId, '..(and similarly for responseId)');
 #----------------------------------------------------------------------------
 # Cleanup
 END {
-    $user->delete() if $user;
     $survey->purge() if $survey;
 
     my $versionTag = WebGUI::VersionTag->getWorking( $session, 1 );
diff --git a/t/Asset/Wobject/Survey/ExpressionEngine.t b/t/Asset/Wobject/Survey/ExpressionEngine.t
index 46e915935..9a65fa079 100644
--- a/t/Asset/Wobject/Survey/ExpressionEngine.t
+++ b/t/Asset/Wobject/Survey/ExpressionEngine.t
@@ -114,6 +114,7 @@ SKIP: {
     
     # Create a test user
     $user = WebGUI::User->new( $session, 'new' );
+    WebGUI::Test->usersToDelete($user);
     
     # Create a Survey
     $versionTag = WebGUI::VersionTag->getWorking($session);
@@ -166,7 +167,6 @@ SKIP: {
 #----------------------------------------------------------------------------
 # Cleanup
 END { 
-    $user->delete if $user;
     $survey->purge if $survey;
     $versionTag->rollback if $versionTag;
 }
diff --git a/t/Session.t b/t/Session.t
index 269d470a6..32883162e 100644
--- a/t/Session.t
+++ b/t/Session.t
@@ -24,6 +24,7 @@ plan tests => 4; # increment this value for each test you create
 my $session = WebGUI::Test->session;
 
 my $user = WebGUI::User->new($session, "new");
+WebGUI::Test->usersToDelete($user);
 
 $session->user({user => $user});
 
@@ -55,8 +56,5 @@ my $slave2 = $session->dbSlave;
 isa_ok($slave2, 'WebGUI::SQL');
 
 END {
-	foreach my $dude ($user) {
-		$dude->delete if (defined $dude and ref $dude eq 'WebGUI::User');
-	}
     $session->config->delete('dbslave2');
 }