diff --git a/t/Asset/Event.t b/t/Asset/Event.t
index 1bb17367b..d50b5c2ef 100644
--- a/t/Asset/Event.t
+++ b/t/Asset/Event.t
@@ -25,6 +25,7 @@ my $session = WebGUI::Test->session;
 
 my $versionTag = WebGUI::VersionTag->getWorking($session);
 $versionTag->set({name=>"Adding Calendar for Event Asset Test"});
+WebGUI::Test->tagsToRollback($versionTag);
 my $defaultAsset = WebGUI::Asset->getDefault($session);
 my $cal = $defaultAsset->addChild({className=>'WebGUI::Asset::Wobject::Calendar'});
 $versionTag->commit;
@@ -45,9 +46,6 @@ my $properties = {
 
 my $event = $cal->addChild($properties, $properties->{id});
 
-my @eventVersionTags = ();
-push @eventVersionTags, WebGUI::VersionTag->new($session, $event->get("tagId"));
-
 is($event->isAllDay, 0, 'isAllDay is zero since it has a start and end time');
 
 my %templateVars = $event->getTemplateVars();
@@ -62,7 +60,6 @@ $properties->{id}        = 'EventAssetTest00000002';
 $properties->{url}       = 'event-asset-test2';
 
 my $event2 = $cal->addChild($properties, $properties->{id});
-push @eventVersionTags, WebGUI::VersionTag->new($session, $event2->get("tagId"));
 
 is($event2->isAllDay, 1, 'isAllDay is zero since it has no start or end time');
 
@@ -78,18 +75,9 @@ $properties->{id}        = 'EventAssetTest00000003';
 $properties->{url}       = 'event-asset-test3';
 
 my $event3 = $cal->addChild($properties, $properties->{id});
-push @eventVersionTags, WebGUI::VersionTag->new($session, $event3->get("tagId"));
 
 is($event3->isAllDay, 1, 'isAllDay is zero since it has no start or end time, even on different days');
 
 %templateVars = $event3->getTemplateVars();
 is($templateVars{dateSpan}, 'Wednesday, August 16 • Thursday, August 17 ', 'getTemplateVars: dateSpan with no times, across two days');
 is($templateVars{isOneDay}, 0, 'getTemplateVars: isOneDay with different start and end dates');
-
-END {
-	# Clean up after thy self
-    $versionTag->rollback;
-    foreach my $evTag (@eventVersionTags) {
-        $evTag->rollback();
-    }
-}