diff --git a/libomptarget/test/lit.cfg b/libomptarget/test/lit.cfg
index 8350c63..adbdd7c 100644
--- a/libomptarget/test/lit.cfg
+++ b/libomptarget/test/lit.cfg
@@ -78,10 +78,6 @@
     " -L " + config.library_dir + \
     " -L " + config.llvm_lib_directory
 
-# compiler specific flags
-config.test_flags_clang = ""
-config.test_flags_flang = ""
-
 if config.omp_host_rtl_directory:
     config.test_flags = config.test_flags + " -L " + \
         config.omp_host_rtl_directory
@@ -140,7 +136,7 @@
     if config.cuda_libdir:
         config.test_flags += " -Wl,-rpath," + config.cuda_libdir
     if config.libomptarget_current_target.startswith('nvptx'):
-        config.test_flags_clang += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
+        config.test_flags += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
     if config.libomptarget_current_target.endswith('-LTO'):
         config.test_flags += " -foffload-lto"
     if config.libomptarget_current_target.endswith('-JIT-LTO') and evaluate_bool_env(
@@ -277,13 +273,13 @@
             libomptarget_target, \
             "%not --crash %t"))
         config.substitutions.append(("%clangxx-" + libomptarget_target, \
-                                     "%clangxx %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
+                                     "%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
                                      remove_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%clang-" + libomptarget_target, \
-                                     "%clang %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
+                                     "%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
                                      remove_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%flang-" + libomptarget_target, \
-                                     "%flang %openmp_flags %flags %flags_flang -fopenmp-targets=" +\
+                                     "%flang %openmp_flags %flags -fopenmp-targets=" +\
                                      remove_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%fcheck-" + libomptarget_target, \
             config.libomptarget_filecheck + " %s"))
@@ -361,6 +357,4 @@
 else:
     config.substitutions.append(("%cuda_flags", ""))
 config.substitutions.append(("%flags", config.test_flags))
-config.substitutions.append(("%flags_clang", config.test_flags_clang))
-config.substitutions.append(("%flags_flang", config.test_flags_flang))
 config.substitutions.append(("%not", config.libomptarget_not))
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90 b/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
index 476b77e..993b91d 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
@@ -1,6 +1,6 @@
 ! Basic offloading test of arrays with provided lower 
 ! and upper bounds as specified by OpenMP's sectioning
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90 b/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
index 229798b..669d367 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
@@ -1,6 +1,6 @@
 ! Basic offloading test of a regular array explicitly
 ! passed within a target region
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90 b/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
index ea30481..c87d6ee 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
@@ -1,6 +1,6 @@
 ! Basic offloading test of a regular array explicitly
 ! passed within a target region
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic_target_region.f90 b/libomptarget/test/offloading/fortran/basic_target_region.f90
index d856d42..6423ac7 100644
--- a/libomptarget/test/offloading/fortran/basic_target_region.f90
+++ b/libomptarget/test/offloading/fortran/basic_target_region.f90
@@ -1,5 +1,5 @@
 ! Basic offloading test with a target region
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/constant-arr-index.f90 b/libomptarget/test/offloading/fortran/constant-arr-index.f90
index 6696305..9064f60 100644
--- a/libomptarget/test/offloading/fortran/constant-arr-index.f90
+++ b/libomptarget/test/offloading/fortran/constant-arr-index.f90
@@ -2,7 +2,8 @@
 ! that checks constant indexing on device
 ! correctly works (regression test for prior
 ! bug).
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa
+! UNSUPPORTED: nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90 b/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
index c091461..d2e59d9 100644
--- a/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
+++ b/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
@@ -1,7 +1,7 @@
 ! Offloading test with a target region mapping a declare target
 ! Fortran array writing some values to it and checking the host
 ! correctly receives the updates made on the device.
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90 b/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
index 56c9672..884acb2 100644
--- a/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
+++ b/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
@@ -2,8 +2,7 @@
 ! declare target Fortran array and writing some values to 
 ! it before checking the host correctly receives the 
 ! correct updates made on the device.
-! REQUIRES: flang
-! UNSUPPORTED: nvptx64-nvidia-cuda
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/target-region-implicit-array.f90 b/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
index ada6ef2..5ef2547 100644
--- a/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
+++ b/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
@@ -1,6 +1,6 @@
 ! Basic offloading test of a regular array explicitly
 ! passed within a target region
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
 ! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/target_map_common_block.f90 b/libomptarget/test/offloading/fortran/target_map_common_block.f90
index f20423e..e782ef8 100644
--- a/libomptarget/test/offloading/fortran/target_map_common_block.f90
+++ b/libomptarget/test/offloading/fortran/target_map_common_block.f90
@@ -1,5 +1,5 @@
 ! Basic offloading test with a target region
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa
 ! UNSUPPORTED: nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu
diff --git a/libomptarget/test/offloading/fortran/target_map_common_block2.f90 b/libomptarget/test/offloading/fortran/target_map_common_block2.f90
index 24e3e2b..8a9c475 100644
--- a/libomptarget/test/offloading/fortran/target_map_common_block2.f90
+++ b/libomptarget/test/offloading/fortran/target_map_common_block2.f90
@@ -1,4 +1,4 @@
-! REQUIRES: flang
+! REQUIRES: flang, amdgcn-amd-amdhsa
 ! UNSUPPORTED: nvptx64-nvidia-cuda
 ! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
 ! UNSUPPORTED: aarch64-unknown-linux-gnu