diff --git a/t/Asset/File/Image/setfile.t b/t/Asset/File/Image/setfile.t
index 0792b0699..a9d8a9030 100644
--- a/t/Asset/File/Image/setfile.t
+++ b/t/Asset/File/Image/setfile.t
@@ -26,6 +26,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Image Test"});
+WebGUI::Test->addToCleanup($versionTag);
 my $image
     = $node->addChild({
         className           => "WebGUI::Asset::File::Image",
@@ -54,9 +55,3 @@ ok(
     "Thumbnail file exists on the filesystem",
 );
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback();
-}
diff --git a/t/Asset/File/setfile.t b/t/Asset/File/setfile.t
index 88f61f1a7..a049ce9f5 100644
--- a/t/Asset/File/setfile.t
+++ b/t/Asset/File/setfile.t
@@ -25,6 +25,7 @@ my $session         = WebGUI::Test->session;
 my $node            = WebGUI::Asset->getImportNode($session);
 my $versionTag      = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"File Test"});
+WebGUI::Test->addToCleanup($versionTag);
 my $file
     = $node->addChild({
         className           => "WebGUI::Asset::File",
@@ -46,18 +47,10 @@ ok(
 #----------------------------------------------------------------------------
 # setFile allows file path argument and adds the file
 # plan tests => 1
-$file->setFile( WebGUI::Test->getTestCollateralPath("WebGUI.pm") );
+$file->setFile( WebGUI::Test->getTestCollateralPath("International/lib/WebGUI/i18n/PigLatin/WebGUI.pm") );
 my $storage = $file->getStorageLocation;
 
 is_deeply(
     $storage->getFiles, ['WebGUI.pm'],
     "Storage location contains only the file we added",
 );
-
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $versionTag->rollback();
-}
-