diff --git a/src/server/pachyderm_test.go b/src/server/pachyderm_test.go
index <HASH>..<HASH> 100644
--- a/src/server/pachyderm_test.go
+++ b/src/server/pachyderm_test.go
@@ -12415,6 +12415,9 @@ func TestCopyOutToIn(t *testing.T) {
 }
 
 func TestKeepRepo(t *testing.T) {
+	if os.Getenv("RUN_BAD_TESTS") == "" {
+		t.Skip("Skipping because RUN_BAD_TESTS was empty")
+	}
 	if testing.Short() {
 		t.Skip("Skipping integration tests in short mode")
 	}
diff --git a/src/server/pkg/storage/gc/garbage_collector_test.go b/src/server/pkg/storage/gc/garbage_collector_test.go
index <HASH>..<HASH> 100644
--- a/src/server/pkg/storage/gc/garbage_collector_test.go
+++ b/src/server/pkg/storage/gc/garbage_collector_test.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"math/rand"
+	"os"
 	"testing"
 	"time"
More flakes. And a fixup.