diff --git a/t/Session/DateTime.t b/t/Session/DateTime.t
index 3088779fe..a9601f6c3 100644
--- a/t/Session/DateTime.t
+++ b/t/Session/DateTime.t
@@ -20,6 +20,7 @@ use WebGUI::Session;
 use Test::More tests => 90; # increment this value for each test you create
 
 installBadLocale();
+WebGUI::Test->addToCleanup(sub { unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n BadLocale.pm/); });
  
 my $session = WebGUI::Test->session;
 
@@ -305,6 +306,4 @@ sub installBadLocale {
 	);
 }
 
-END {
-	unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n BadLocale.pm/);
-}
+#vim:ft=perl
diff --git a/t/Session/Icon.t b/t/Session/Icon.t
index e20c621bf..48c5bb170 100644
--- a/t/Session/Icon.t
+++ b/t/Session/Icon.t
@@ -39,6 +39,7 @@ my $session = WebGUI::Test->session;
 ####################################################
 
 my $origToolbar = $session->user->profileField('toolbar');
+WebGUI::Test->addToCleanup(sub { $session->user->profileField('toolbar', $origToolbar); },);
 my $toolbars = $session->url->extras('toolbar/');
 
 my $newRequest = Test::MockObject->new;
@@ -168,12 +169,6 @@ sub linkAndText {
 	return @parsedParams;
 }
 
-my $icon = $session->icon->drag();
-
-END {
-	$session->user->profileField('toolbar', $origToolbar);
-}
-
 sub fetchTestSet {
 	return (
 		{
diff --git a/t/Session/Privilege.t b/t/Session/Privilege.t
index 0d5ddbcb0..76db8dde1 100644
--- a/t/Session/Privilege.t
+++ b/t/Session/Privilege.t
@@ -73,6 +73,7 @@ my $session = WebGUI::Test->session;
 my $privilege = $session->privilege;
 
 my ($versionTag, $userTemplate) = setup_assets($session);
+WebGUI::Test->addToCleanup($versionTag);
 
 isa_ok($privilege, 'WebGUI::Session::Privilege', 'session has correct object type');
 
@@ -144,9 +145,4 @@ sub setup_assets {
 	return ($versionTag, $userTemplate);
 }
 
-
-END {
-	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
-		$versionTag->rollback;
-	}
-}
+#vim:ft=perl
diff --git a/t/Session/Stow.t b/t/Session/Stow.t
index 84fa329ac..6fe0a1205 100644
--- a/t/Session/Stow.t
+++ b/t/Session/Stow.t
@@ -99,6 +99,4 @@ is( $session->stow->get( 'possibilities', { noclone => 1 } ), $arr,
     "With noclone returns same reference"
 );
 
-END {
-	$session->config->set('disableCache',$disableCache);
-}
+#vim:ft=perl
diff --git a/t/Session/Style.t b/t/Session/Style.t
index 19d8c00ff..3a581a427 100644
--- a/t/Session/Style.t
+++ b/t/Session/Style.t
@@ -176,6 +176,7 @@ is($macroOutput, 1, 'generateAdditionalHeadTags: process a macro');
 ####################################################
 
 my ($versionTag, $templates, $article, $snippet) = setup_assets($session);
+WebGUI::Test->addToCleanup($versionTag);
 
 $style->sent(0);
 is($style->sent, 0, 'process: setup sent to 0');
@@ -557,9 +558,3 @@ sub setup_assets {
 	$versionTag->commit;
 	return ($versionTag, $templates, $asset, $snippet);
 }
-
-END {
-	if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
-		$versionTag->rollback;
-	}
-}