diff --git a/bats/feature-version.bats b/bats/feature-version.bats
index 377c4d9148..53e9f27403 100644
--- a/bats/feature-version.bats
+++ b/bats/feature-version.bats
@@ -6,7 +6,7 @@ setup() {
 }
 
 teardown() {
-     rm -rf "$BATS_TMPDIR/dolt-repo-$$"
+     teardown_common
 }
 
 # client FeatureVersion must be >= repo FeatureVersion to read
diff --git a/bats/helper/common.bash b/bats/helper/common.bash
index 017808e3a1..a9d5e15ef9 100644
--- a/bats/helper/common.bash
+++ b/bats/helper/common.bash
@@ -52,7 +52,6 @@ setup_common() {
 }
 
 teardown_common() {
-    assert_feature_version
     rm -rf "$BATS_TMPDIR/dolt-repo-$$"
 }
 
diff --git a/bats/import-create-tables.bats b/bats/import-create-tables.bats
index 18dae2e388..d1caba4e06 100755
--- a/bats/import-create-tables.bats
+++ b/bats/import-create-tables.bats
@@ -48,6 +48,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 
diff --git a/bats/import-replace-tables.bats b/bats/import-replace-tables.bats
index a6368e182e..b7af5ea402 100644
--- a/bats/import-replace-tables.bats
+++ b/bats/import-replace-tables.bats
@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+  assert_feature_version
   teardown_common
 }
 
diff --git a/bats/import-update-tables.bats b/bats/import-update-tables.bats
index fd6b11bffe..f13948cba0 100644
--- a/bats/import-update-tables.bats
+++ b/bats/import-update-tables.bats
@@ -37,6 +37,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }