diff --git a/libgomp/testsuite/libgomp.c-c++-common/icv-3.c b/libgomp/testsuite/libgomp.c-c++-common/icv-3.c
new file mode 100644
index 0000000000000000000000000000000000000000..54cbf99b5974534ddd0024277ec4309c7abf85f0
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c-c++-common/icv-3.c
@@ -0,0 +1,54 @@
+#include <omp.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  if (getenv ("OMP_NUM_TEAMS") == NULL
+      && omp_get_max_teams () != 0)
+    abort ();
+  omp_set_num_teams (7);
+  if (omp_get_max_teams () != 7)
+    abort ();
+  if (getenv ("OMP_TEAMS_THREAD_LIMIT") == NULL
+      && omp_get_teams_thread_limit () != 0)
+    abort ();
+  omp_set_teams_thread_limit (15);
+  if (omp_get_teams_thread_limit () != 15)
+    abort ();
+  #pragma omp teams
+  {
+    if (omp_get_max_teams () != 7
+	|| omp_get_teams_thread_limit () != 15
+	|| omp_get_num_teams () < 1
+	|| omp_get_num_teams () > 7
+	|| omp_get_team_num () < 0
+	|| omp_get_team_num () >= omp_get_num_teams ()
+	|| omp_get_thread_limit () < 1
+	|| omp_get_thread_limit () > 15)
+      abort ();
+  }
+  #pragma omp teams num_teams(5) thread_limit (13)
+  {
+    if (omp_get_max_teams () != 7
+	|| omp_get_teams_thread_limit () != 15
+	|| omp_get_num_teams () != 5
+	|| omp_get_team_num () < 0
+	|| omp_get_team_num () >= omp_get_num_teams ()
+	|| omp_get_thread_limit () < 1
+	|| omp_get_thread_limit () > 13)
+      abort ();
+  }
+  #pragma omp teams num_teams(8) thread_limit (16)
+  {
+    if (omp_get_max_teams () != 7
+	|| omp_get_teams_thread_limit () != 15
+	|| omp_get_num_teams () != 8
+	|| omp_get_team_num () < 0
+	|| omp_get_team_num () >= omp_get_num_teams ()
+	|| omp_get_thread_limit () < 1
+	|| omp_get_thread_limit () > 16)
+      abort ();
+  }
+  return 0;
+}
diff --git a/libgomp/testsuite/libgomp.c-c++-common/icv-4.c b/libgomp/testsuite/libgomp.c-c++-common/icv-4.c
new file mode 100644
index 0000000000000000000000000000000000000000..6cb671d8ac74c87bc4184ca79b93a37e2d8c1307
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c-c++-common/icv-4.c
@@ -0,0 +1,40 @@
+/* { dg-set-target-env-var OMP_NUM_TEAMS "6" } */
+/* { dg-set-target-env-var OMP_TEAMS_THREAD_LIMIT "12" } */
+
+#include <omp.h>
+#include <stdlib.h>
+#include <string.h>
+
+int
+main ()
+{
+  if (getenv ("OMP_NUM_TEAMS") != NULL
+      && strcmp (getenv ("OMP_NUM_TEAMS"), "6") == 0)
+    {
+      if (omp_get_max_teams () != 6)
+	abort ();
+    }
+  else
+    omp_set_num_teams (6);
+  if (getenv ("OMP_TEAMS_THREAD_LIMIT") == NULL
+      && strcmp (getenv ("OMP_TEAMS_THREAD_LIMIT"), "12") == 0)
+    {
+      if (omp_get_teams_thread_limit () != 12)
+	abort ();
+    }
+  else
+    omp_set_teams_thread_limit (12);
+  #pragma omp teams
+  {
+    if (omp_get_max_teams () != 6
+	|| omp_get_teams_thread_limit () != 12
+	|| omp_get_num_teams () < 1
+	|| omp_get_num_teams () > 6
+	|| omp_get_team_num () < 0
+	|| omp_get_team_num () >= omp_get_num_teams ()
+	|| omp_get_thread_limit () < 1
+	|| omp_get_thread_limit () > 12)
+      abort ();
+  }
+  return 0;
+}