diff --git a/tests/hipify-clang/lit.cfg b/tests/hipify-clang/lit.cfg
index 79be2b3d39..ea496e6a69 100644
--- a/tests/hipify-clang/lit.cfg
+++ b/tests/hipify-clang/lit.cfg
@@ -111,12 +111,18 @@ if config.pointer_size == 8:
 # Set max clang's CudaArch for corresponding CUDA version
 # to support maximum CUDA features in offline tests
 if config.cuda_version_major == 7:
-    clang_arguments += " --cuda-gpu-arch=sm_52"
-if config.cuda_version_major == 8:
+    if config.cuda_version_minor == 5:
+        clang_arguments += " --cuda-gpu-arch=sm_53"
+    else:
+        clang_arguments += " --cuda-gpu-arch=sm_52"
+elif config.cuda_version_major == 8:
     clang_arguments += " --cuda-gpu-arch=sm_62"
-if config.cuda_version_major == 9:
-    clang_arguments += " --cuda-gpu-arch=sm_70"
-if config.cuda_version_major == 10:
+elif config.cuda_version_major == 9:
+    if config.cuda_version_minor == 2:
+        clang_arguments += " --cuda-gpu-arch=sm_72"
+    else:
+        clang_arguments += " --cuda-gpu-arch=sm_70"
+elif config.cuda_version_major == 10:
     clang_arguments += " --cuda-gpu-arch=sm_75"
 
 # cuDNN ROOT
diff --git a/tests/hipify-clang/unit_tests/device/atomics.cu b/tests/hipify-clang/unit_tests/device/atomics.cu
index e24b9a2175..3089efe1b8 100644
--- a/tests/hipify-clang/unit_tests/device/atomics.cu
+++ b/tests/hipify-clang/unit_tests/device/atomics.cu
@@ -276,7 +276,7 @@ int main(int argc, char** argv) {
     runTest<unsigned int>();
     runTest<unsigned long long>();
     runTest<float>();
-#if CUDA_VERSION >= 8000
+#if CUDA_VERSION >= 8000 && defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 600
     runTest<double>();
 #endif
     // CHECK: hipDeviceReset();