diff --git a/t/Asset/File/GalleryFile/Photo/exif.t b/t/Asset/File/GalleryFile/Photo/exif.t
index 303065b0b..1e1725a1f 100644
--- a/t/Asset/File/GalleryFile/Photo/exif.t
+++ b/t/Asset/File/GalleryFile/Photo/exif.t
@@ -26,6 +26,7 @@ use Image::ExifTool qw(:Public);
 my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->addToCleanup($versionTag);
 $versionTag->set({name=>"Photo Test"});
 my $gallery
     = $node->addChild({
@@ -62,12 +63,6 @@ for my $key ( qw{ Directory } ) {
 }
 
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback();
-}
-
 #----------------------------------------------------------------------------
 # Tests
 plan tests => 2;
@@ -86,3 +81,5 @@ is_deeply(
     [ sort map { $_->{tag} } @{ $var->{exifLoop} } ],
     "getTemplateVars gets a loop over the tags",
 );
+
+#vim:ft=perl
diff --git a/t/Asset/File/GalleryFile/Photo/makeResolutions.t b/t/Asset/File/GalleryFile/Photo/makeResolutions.t
index 415124e38..9305c9cb1 100644
--- a/t/Asset/File/GalleryFile/Photo/makeResolutions.t
+++ b/t/Asset/File/GalleryFile/Photo/makeResolutions.t
@@ -29,6 +29,7 @@ my $node            = WebGUI::Asset->getImportNode($session);
 my @versionTags = ();
 push @versionTags, WebGUI::VersionTag->getWorking($session);
 $versionTags[-1]->set({name=>"Photo Test"});
+WebGUI::Test->addToCleanup($versionTags[-1]);
 
 my ($gallery, $album, $photo);
 $gallery
@@ -86,6 +87,7 @@ TODO: {
 # Array of resolutions passed to makeResolutions overrides defaults from 
 # parent asset
 push @versionTags, WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $gallery
     = $node->addChild({
         className           => "WebGUI::Asset::Wobject::Gallery",
@@ -139,6 +141,7 @@ TODO: {
 # makeResolutions allows API to specify resolutions to make as array reference
 # argument
 push @versionTags, WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $photo
     = $node->addChild({
         className           => "WebGUI::Asset::File::GalleryFile::Photo",
@@ -176,6 +179,7 @@ TODO: {
 #----------------------------------------------------------------------------
 # makeResolutions throws a warning on an invalid resolution but keeps going
 push @versionTags, WebGUI::VersionTag->getWorking($session);
+WebGUI::Test->addToCleanup($versionTags[-1]);
 $photo
     = $node->addChild({
         className           => "WebGUI::Asset::File::GalleryFile::Photo",
@@ -221,12 +225,4 @@ $photo->update({ filename => 'page_title.jpg' });
     );
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    foreach my $versionTag (@versionTags) {
-        $versionTag->rollback;
-    }
-}
-
-
+#vim:ft=perl
diff --git a/t/Asset/File/GalleryFile/Photo/makeShortcut.t b/t/Asset/File/GalleryFile/Photo/makeShortcut.t
index eb74e6ce9..6ebee5d56 100644
--- a/t/Asset/File/GalleryFile/Photo/makeShortcut.t
+++ b/t/Asset/File/GalleryFile/Photo/makeShortcut.t
@@ -29,6 +29,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Photo Test"});
+WebGUI::Test->addToCleanup($versionTag);
 my $maker           = WebGUI::Test::Maker::HTML->new;
 my $otherParent
     = $node->addChild({
@@ -119,10 +120,4 @@ cmp_deeply(
 #----------------------------------------------------------------------------
 # www_makeShortcut
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback();
-}
-
-
+#vim:ft=perl
diff --git a/t/Asset/Wobject/Collaboration/getThreads.t b/t/Asset/Wobject/Collaboration/getThreads.t
index 61a343b6d..c0556106c 100644
--- a/t/Asset/Wobject/Collaboration/getThreads.t
+++ b/t/Asset/Wobject/Collaboration/getThreads.t
@@ -25,6 +25,7 @@ use WebGUI::Session;
 # Init
 my $session         = WebGUI::Test->session;
 my @versionTags     = ( WebGUI::VersionTag->getWorking( $session ) );
+WebGUI::Test->addToCleanup($versionTags[-1]);
 my @addChildArgs    = ( {skipAutoCommitWorkflows=>1} );
 my $collab          = WebGUI::Asset->getImportNode( $session )->addChild({
     className       => 'WebGUI::Asset::Wobject::Collaboration',
@@ -206,12 +207,6 @@ $session->request->setup_param({});
 $session->scratch->delete($collab->getId.'_sortBy');
 $session->scratch->delete($collab->getId.'_sortDir');
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $_->rollback for @versionTags;
-}
-
 #----------------------------------------------------------------------------
 # sortThreads( \&sortSub, @threads )
 # Sort threads according to the given subref. Return an arrayref of hashrefs
diff --git a/t/Asset/Wobject/Collaboration/permission.t b/t/Asset/Wobject/Collaboration/permission.t
index 2e2678096..ad56908b9 100644
--- a/t/Asset/Wobject/Collaboration/permission.t
+++ b/t/Asset/Wobject/Collaboration/permission.t
@@ -35,6 +35,7 @@ WebGUI::Test->addToCleanup($user{'2'});
 
 my $versionTag      = WebGUI::VersionTag->getWorking( $session );
 $versionTag->set( { name => "Collaboration Test" } );
+WebGUI::Test->addToCleanup($versionTag);
 
 my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1 } );
 
@@ -106,8 +107,4 @@ $maker->prepare( {
     fail        => [ '1', $user{"2"}, ],
 } )->run;
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback;
-}
+#vim:ft=perl
diff --git a/t/Asset/Wobject/DataForm/moveField.t b/t/Asset/Wobject/DataForm/moveField.t
index 7c744b400..f81adf357 100644
--- a/t/Asset/Wobject/DataForm/moveField.t
+++ b/t/Asset/Wobject/DataForm/moveField.t
@@ -35,6 +35,7 @@ my $df  = WebGUI::Asset->getImportNode( $session )
             mailData            => 0,
             fieldConfiguration  => '[]',
         } );
+WebGUI::Test->addToCleanup($df);
 
 # Add three fields to the DataForm
 $df->createField( "one", { label => "One" } );
@@ -98,10 +99,4 @@ cmp_deeply(
 );
 
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $df->purge;
-    WebGUI::VersionTag->getWorking( $session )->rollback;
-}
 #vim:ft=perl
diff --git a/t/Inbox.t b/t/Inbox.t
index 1b5d156e0..c43d5c4e9 100644
--- a/t/Inbox.t
+++ b/t/Inbox.t
@@ -23,6 +23,7 @@ my $session = WebGUI::Test->session;
 
 # get a user so we can test retrieving messages for a specific user
 my $admin = WebGUI::User->new($session, 3);
+WebGUI::Test->addToCleanup(sub { WebGUI::Test->cleanupAdminInbox; });
 
 # Begin tests by getting an inbox object
 my $inbox = WebGUI::Inbox->new($session); 
@@ -133,9 +134,4 @@ note $messages->[0]->getStatus;
 note $messages->[0]->isRead;
 is($inbox->getUnreadMessageCount($admin->userId), 3, '... really tracks unread messages');
 
-END {
-    foreach my $message (@{ $inbox->getMessagesForUser($admin, 1000) } ) {
-        $message->setDeleted(3);
-        $message->delete(3);
-    }
-}
+#vim:ft=perl