diff --git a/t/Shop/ShipDriver/FlatRate.t b/t/Shop/ShipDriver/FlatRate.t
index 36c557d32..a9e03b95a 100644
--- a/t/Shop/ShipDriver/FlatRate.t
+++ b/t/Shop/ShipDriver/FlatRate.t
@@ -329,4 +329,8 @@ END {
     if (defined $car && (ref($car) eq 'WebGUI::Asset::Sku::Product')) {
         $car->purge;
     }
+    my $tag = WebGUI::VersionTag->getWorking($session, 'nocreate');
+    if (defined $tag) {
+        $tag->rollback;
+    }
 }