diff --git a/lib/auth/keystore/keystore_test.go b/lib/auth/keystore/keystore_test.go
index 2b021d1130c05..4d5167fde88a4 100644
--- a/lib/auth/keystore/keystore_test.go
+++ b/lib/auth/keystore/keystore_test.go
@@ -127,10 +127,6 @@ JhuTMEqUaAOZBoQLn+txjl3nu9WwTThJzlY0L4w=
 )
 
 func TestKeyStore(t *testing.T) {
-	t.Parallel()
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
 	modules.SetTestModules(t, &modules.TestModules{
 		TestBuildType: modules.BuildEnterprise,
 		TestFeatures: modules.Features{
@@ -138,6 +134,9 @@ func TestKeyStore(t *testing.T) {
 		},
 	})
 
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
 	skipSoftHSM := os.Getenv("SOFTHSM2_PATH") == ""
 	var softHSMConfig Config
 	if !skipSoftHSM {
diff --git a/lib/modules/test.go b/lib/modules/test.go
index 7d5600edcd83d..8bfa98adb02db 100644
--- a/lib/modules/test.go
+++ b/lib/modules/test.go
@@ -62,6 +62,7 @@ type TestModules struct {
 func SetTestModules(t *testing.T, testModules *TestModules) {
 	defaultModules := GetModules()
 	t.Cleanup(func() { SetModules(defaultModules) })
+	t.Setenv("TELEPORT_TEST_NOT_SAFE_FOR_PARALLEL", "true")
 	SetModules(testModules)
 }
 
diff --git a/lib/srv/session_control_test.go b/lib/srv/session_control_test.go
index 9dfd6b144610d..6459c92df4009 100644
--- a/lib/srv/session_control_test.go
+++ b/lib/srv/session_control_test.go
@@ -102,8 +102,6 @@ func (m mockAccessChecker) RoleNames() []string {
 }
 
 func TestSessionController_AcquireSessionContext(t *testing.T) {
-	t.Parallel()
-
 	clock := clockwork.NewFakeClock()
 	emitter := &eventstest.MockEmitter{}
 
diff --git a/lib/web/apiserver_test.go b/lib/web/apiserver_test.go
index d57d07c9a4fb8..3387f83b1c7bd 100644
--- a/lib/web/apiserver_test.go
+++ b/lib/web/apiserver_test.go
@@ -1994,13 +1994,12 @@ func TestWebAgentForward(t *testing.T) {
 }
 
 func TestActiveSessions(t *testing.T) {
-	t.Parallel()
-	s := newWebSuite(t)
-	pack := s.authPack(t, "foo")
-
 	// Use enterprise license (required for moderated sessions).
 	modules.SetTestModules(t, &modules.TestModules{TestBuildType: modules.BuildEnterprise})
 
+	s := newWebSuite(t)
+	pack := s.authPack(t, "foo")
+
 	start := time.Now()
 	kinds := []types.SessionKind{
 		types.SSHSessionKind,