diff --git a/test/smoke-limbo/no-loop-1/Makefile b/test/smoke-limbo/no-loop-1/Makefile
index 9777473644..c6eaea62ce 100644
--- a/test/smoke-limbo/no-loop-1/Makefile
+++ b/test/smoke-limbo/no-loop-1/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/no-loop-4/Makefile b/test/smoke-limbo/no-loop-4/Makefile
index e0e6fccc21..8fe0fab40a 100644
--- a/test/smoke-limbo/no-loop-4/Makefile
+++ b/test/smoke-limbo/no-loop-4/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-fast -fno-openmp-target-ignore-env-vars
+CFLAGS       += -fopenmp-target-fast 
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/no-loop-7/Makefile b/test/smoke-limbo/no-loop-7/Makefile
index 40d5646cfc..f49cfc021e 100644
--- a/test/smoke-limbo/no-loop-7/Makefile
+++ b/test/smoke-limbo/no-loop-7/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -O3 -fno-openmp-target-ignore-env-vars -fopenmp-target-fast
+CFLAGS       += -O3  -fopenmp-target-fast
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/no-loop-threads/Makefile b/test/smoke-limbo/no-loop-threads/Makefile
index f005e57794..e4240b7671 100644
--- a/test/smoke-limbo/no-loop-threads/Makefile
+++ b/test/smoke-limbo/no-loop-threads/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/opt-kernel-global-iv/Makefile b/test/smoke-limbo/opt-kernel-global-iv/Makefile
index 700ddf908c..bee39e451b 100644
--- a/test/smoke-limbo/opt-kernel-global-iv/Makefile
+++ b/test/smoke-limbo/opt-kernel-global-iv/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/opt-kernel-inner-pragma-1/Makefile b/test/smoke-limbo/opt-kernel-inner-pragma-1/Makefile
index d204a8b97f..b306f39649 100644
--- a/test/smoke-limbo/opt-kernel-inner-pragma-1/Makefile
+++ b/test/smoke-limbo/opt-kernel-inner-pragma-1/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/xteam-red-4/Makefile b/test/smoke-limbo/xteam-red-4/Makefile
index e72f231ff1..04d16364e6 100644
--- a/test/smoke-limbo/xteam-red-4/Makefile
+++ b/test/smoke-limbo/xteam-red-4/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke-limbo/xteam-red-fast-1/Makefile b/test/smoke-limbo/xteam-red-fast-1/Makefile
index 49074b4906..5e3cb4a946 100644
--- a/test/smoke-limbo/xteam-red-fast-1/Makefile
+++ b/test/smoke-limbo/xteam-red-fast-1/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-target-fast-reduction
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-target-fast-reduction
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/c-heatx/Makefile b/test/smoke/c-heatx/Makefile
index 36813ae697..4728134494 100644
--- a/test/smoke/c-heatx/Makefile
+++ b/test/smoke/c-heatx/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = c-heatx.c
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CLANG        = clang -fopenmp-target-ignore-env-vars
+CLANG        = clang -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
 #-ccc-print-phases
diff --git a/test/smoke/collapse_parallel_spmd/Makefile b/test/smoke/collapse_parallel_spmd/Makefile
index c430eb047e..d20a2f5a97 100644
--- a/test/smoke/collapse_parallel_spmd/Makefile
+++ b/test/smoke/collapse_parallel_spmd/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = collapse_parallel_spmd.c
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -O3 -fno-openmp-target-ignore-env-vars
+CFLAGS       += -O3 
 CLANG        ?= clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/envvar-sync-async-perf/Makefile b/test/smoke/envvar-sync-async-perf/Makefile
index a7f0abbfa1..c1beb4ec0a 100644
--- a/test/smoke/envvar-sync-async-perf/Makefile
+++ b/test/smoke/envvar-sync-async-perf/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = target-map.cpp
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -O3 -fno-openmp-target-ignore-env-vars
+CFLAGS       += -O3 
 CLANG        ?= clang++
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/envvar-sync-async/Makefile b/test/smoke/envvar-sync-async/Makefile
index 5c55a03571..6701afd33b 100644
--- a/test/smoke/envvar-sync-async/Makefile
+++ b/test/smoke/envvar-sync-async/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = envvar-sync-async.c
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -O3 -fno-openmp-target-ignore-env-vars
+CFLAGS       += -O3 
 CLANG        ?= clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-1/Makefile b/test/smoke/loop-dir-1/Makefile
index d42c75489d..814001d699 100644
--- a/test/smoke/loop-dir-1/Makefile
+++ b/test/smoke/loop-dir-1/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-2/Makefile b/test/smoke/loop-dir-2/Makefile
index 8008a74148..7c47bba945 100644
--- a/test/smoke/loop-dir-2/Makefile
+++ b/test/smoke/loop-dir-2/Makefile
@@ -8,7 +8,7 @@ TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
 #RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-3/Makefile b/test/smoke/loop-dir-3/Makefile
index 7ac086ee11..04198beabb 100644
--- a/test/smoke/loop-dir-3/Makefile
+++ b/test/smoke/loop-dir-3/Makefile
@@ -6,7 +6,7 @@ TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 # RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-4/Makefile b/test/smoke/loop-dir-4/Makefile
index 70bc361ebc..7eecd3d61a 100644
--- a/test/smoke/loop-dir-4/Makefile
+++ b/test/smoke/loop-dir-4/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = loop_dir_4.cpp
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        ?= clang++
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-5/Makefile b/test/smoke/loop-dir-5/Makefile
index 37cac7242f..70fe1080d7 100644
--- a/test/smoke/loop-dir-5/Makefile
+++ b/test/smoke/loop-dir-5/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = loop_dir_5.c
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-6/Makefile b/test/smoke/loop-dir-6/Makefile
index 039a514b01..d0d96b245f 100644
--- a/test/smoke/loop-dir-6/Makefile
+++ b/test/smoke/loop-dir-6/Makefile
@@ -6,7 +6,7 @@ TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 # RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-7/Makefile b/test/smoke/loop-dir-7/Makefile
index d4e210e192..77ffab0c7e 100644
--- a/test/smoke/loop-dir-7/Makefile
+++ b/test/smoke/loop-dir-7/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = loop_dir_7.cpp
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        ?= clang++
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-8/Makefile b/test/smoke/loop-dir-8/Makefile
index 1c13ac182e..d44b2835a7 100644
--- a/test/smoke/loop-dir-8/Makefile
+++ b/test/smoke/loop-dir-8/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/loop-dir-9/Makefile b/test/smoke/loop-dir-9/Makefile
index de7f78f8c2..c5bef0f2b9 100644
--- a/test/smoke/loop-dir-9/Makefile
+++ b/test/smoke/loop-dir-9/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/matmul_parallel_spmd/Makefile b/test/smoke/matmul_parallel_spmd/Makefile
index 5d0464f2a0..a838d7c1c3 100644
--- a/test/smoke/matmul_parallel_spmd/Makefile
+++ b/test/smoke/matmul_parallel_spmd/Makefile
@@ -5,7 +5,7 @@ TESTSRC_MAIN = matmul_parallel_spmd.c
 TESTSRC_AUX  =
 TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 
-CFLAGS       += -O3 -fno-openmp-target-ignore-env-vars
+CFLAGS       += -O3 
 CLANG        ?= clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/no-loop-8/Makefile b/test/smoke/no-loop-8/Makefile
index 38e161ba3c..168bf6aced 100644
--- a/test/smoke/no-loop-8/Makefile
+++ b/test/smoke/no-loop-8/Makefile
@@ -8,7 +8,7 @@ TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/no-loop-sched/Makefile b/test/smoke/no-loop-sched/Makefile
index e40d0cabdf..a13fc6ad55 100644
--- a/test/smoke/no-loop-sched/Makefile
+++ b/test/smoke/no-loop-sched/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/no-loop-split-with-inner-private-clause/Makefile b/test/smoke/no-loop-split-with-inner-private-clause/Makefile
index 541360a9a1..3f410c1673 100644
--- a/test/smoke/no-loop-split-with-inner-private-clause/Makefile
+++ b/test/smoke/no-loop-split-with-inner-private-clause/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        ?= clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/no-loop-with-continue/Makefile b/test/smoke/no-loop-with-continue/Makefile
index 37a8b7a58a..d9f81d081e 100644
--- a/test/smoke/no-loop-with-continue/Makefile
+++ b/test/smoke/no-loop-with-continue/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
diff --git a/test/smoke/xteam-red-1/Makefile b/test/smoke/xteam-red-1/Makefile
index 418d6ebcde..c042aa96e8 100644
--- a/test/smoke/xteam-red-1/Makefile
+++ b/test/smoke/xteam-red-1/Makefile
@@ -8,7 +8,7 @@ RUNENV      += LIBOMPTARGET_KERNEL_TRACE=1
 
 RUNCMD      = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
 
-CFLAGS       += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
+CFLAGS       += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
 CLANG        = clang
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)