diff --git a/t/Search/Index.t b/t/Search/Index.t
index 6ca61bab5..261c4b294 100644
--- a/t/Search/Index.t
+++ b/t/Search/Index.t
@@ -33,6 +33,9 @@ my $article         = WebGUI::Asset->getImportNode( $session )->addChild( {
     title           => 'title',
     menuTitle       => 'menuTitle',
 } );
+WebGUI::Test->tagsToRollback(
+    WebGUI::VersionTag->getWorking( $session ),
+);
 
 #----------------------------------------------------------------------------
 # Tests
@@ -224,10 +227,4 @@ cmp_deeply (
     "Index has correct information" 
 );
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    WebGUI::VersionTag->getWorking( $session )->rollback;
-}
 #vim:ft=perl