diff --git a/hipify-clang/src/ArgParse.cpp b/hipify-clang/src/ArgParse.cpp
index e5915aedb9..d9efe1732d 100644
--- a/hipify-clang/src/ArgParse.cpp
+++ b/hipify-clang/src/ArgParse.cpp
@@ -39,6 +39,11 @@ cl::opt<std::string> TemporaryDir("temp-dir",
   cl::value_desc("directory"),
   cl::cat(ToolTemplateCategory));
 
+cl::opt<std::string> CudaPath("cuda-path",
+  cl::desc("CUDA installation path"),
+  cl::value_desc("directory"),
+  cl::cat(ToolTemplateCategory));
+
 cl::opt <bool> SaveTemps("save-temps",
   cl::desc("Save temporary files"),
   cl::value_desc("save-temps"),
diff --git a/hipify-clang/src/ArgParse.h b/hipify-clang/src/ArgParse.h
index 70a6a9b28d..28195fd93f 100644
--- a/hipify-clang/src/ArgParse.h
+++ b/hipify-clang/src/ArgParse.h
@@ -32,6 +32,7 @@ extern cl::OptionCategory ToolTemplateCategory;
 extern cl::opt<std::string> OutputFilename;
 extern cl::opt<std::string> OutputDir;
 extern cl::opt<std::string> TemporaryDir;
+extern cl::opt<std::string> CudaPath;
 extern cl::opt<bool> Inplace;
 extern cl::opt<bool> SaveTemps;
 extern cl::opt<bool> NoBackup;
diff --git a/hipify-clang/src/main.cpp b/hipify-clang/src/main.cpp
index bd54975e59..1f26df4886 100644
--- a/hipify-clang/src/main.cpp
+++ b/hipify-clang/src/main.cpp
@@ -174,6 +174,10 @@ int main(int argc, const char **argv) {
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("cuda", ct::ArgumentInsertPosition::BEGIN));
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-x", ct::ArgumentInsertPosition::BEGIN));
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("--cuda-host-only", ct::ArgumentInsertPosition::BEGIN));
+    if (!CudaPath.empty()) {
+      std::string sCudaPath = "--cuda-path=" + CudaPath;
+      Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(sCudaPath.c_str(), ct::ArgumentInsertPosition::BEGIN));
+    }
     // Includes for clang's CUDA wrappers for using by packaged hipify-clang
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("./include", ct::ArgumentInsertPosition::BEGIN));
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-isystem", ct::ArgumentInsertPosition::BEGIN));
diff --git a/tests/hipify-clang/lit.cfg b/tests/hipify-clang/lit.cfg
index 76a811031a..c65193d8d4 100644
--- a/tests/hipify-clang/lit.cfg
+++ b/tests/hipify-clang/lit.cfg
@@ -64,18 +64,20 @@ if obj_root is not None:
     config.environment['PATH'] = path
 
 hipify_path = obj_root
-clang_args = "-v --cuda-path='%s'"
 
+clang_arguments = "-v"
 if sys.platform in ['win32']:
     run_test_ext = ".bat"
     hipify_path += "/" + config.build_type
-    clang_args += " -isystem'%s'/common/inc"
+    clang_arguments += " -isystem'%s'/common/inc"
 else:
     run_test_ext = ".sh"
-    clang_args += " -isystem'%s'/samples/common/inc"
+    clang_arguments += " -isystem'%s'/samples/common/inc"
+clang_arguments += " -I'%s'/include"
 
-clang_args += " -I'%s'/include"
+hipify_arguments = "-cuda-path='%s'"
 
-config.substitutions.append(("%cuda_args", clang_args % (config.cuda_root, config.cuda_sdk_root, config.cuda_dnn_root)))
+config.substitutions.append(("%clang_args", clang_arguments % (config.cuda_sdk_root, config.cuda_dnn_root)))
+config.substitutions.append(("%hipify_args", hipify_arguments % (config.cuda_root)))
 config.substitutions.append(("hipify", '"' + hipify_path + "/hipify-clang" + '"'))
 config.substitutions.append(("%run_test", '"' + config.test_source_root + "/run_test" + run_test_ext + '"'))
diff --git a/tests/hipify-clang/run_test.bat b/tests/hipify-clang/run_test.bat
index d8c8d74cf0..58563be2c7 100644
--- a/tests/hipify-clang/run_test.bat
+++ b/tests/hipify-clang/run_test.bat
@@ -2,17 +2,18 @@
 setlocal
 
 for %%i in (FileCheck.exe) do set FILE_CHECK=%%~$PATH:i
-if not defined FILE_CHECK (echo     Error: FileCheck.exe not found in PATH. && exit /b 1)
+if not defined FILE_CHECK (echo      Error: FileCheck.exe not found in PATH. && exit /b 1)
 
 set HIPIFY=%1
 set IN_FILE=%2
 set TMP_FILE=%3
+set CUDA_ROOT=%4
 
 set all_args=%*
-call set clang_args=%%all_args:*%4=%%
-set clang_args=%4%clang_args%
+call set clang_args=%%all_args:*%5=%%
+set clang_args=%5%clang_args%
 
-%HIPIFY% -o=%TMP_FILE% %IN_FILE% -- %clang_args%
+%HIPIFY% -o=%TMP_FILE% %IN_FILE% %CUDA_ROOT% -- %clang_args%
 if errorlevel 1 (echo      Error: hipify-clang.exe failed with exit code: %errorlevel% && exit /b %errorlevel%)
 
 findstr /v /r /c:"[ ]*//[ ]*[CHECK*|RUN]" %TMP_FILE% | %FILE_CHECK% %IN_FILE%
diff --git a/tests/hipify-clang/run_test.sh b/tests/hipify-clang/run_test.sh
index 418df5dd4d..eb3e822549 100755
--- a/tests/hipify-clang/run_test.sh
+++ b/tests/hipify-clang/run_test.sh
@@ -9,9 +9,9 @@ set -o errexit
 HIPIFY=$1
 IN_FILE=$2
 TMP_FILE=$3
-shift 3
+CUDA_ROOT=$4
+shift 4
 
 # Remaining args are the ones to forward to clang proper.
 
-$HIPIFY -o=$TMP_FILE $IN_FILE -- $@ && cat $TMP_FILE | sed -Ee 's|//.+|// |g' | FileCheck $IN_FILE
-
+$HIPIFY -o=$TMP_FILE $IN_FILE $CUDA_ROOT -- $@ && cat $TMP_FILE | sed -Ee 's|//.+|// |g' | FileCheck $IN_FILE
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_01.cu b/tests/hipify-clang/unit_tests/headers/headers_test_01.cu
index 3747c339e8..013d7c17c4 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_01.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_01.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 // CHECK-NOT: #include <cuda_runtime.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_02.cu b/tests/hipify-clang/unit_tests/headers/headers_test_02.cu
index 57308efd59..957fd16559 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_02.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_02.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include "hip/hip_runtime.h"
 // CHECK-NOT: #include "cuda_runtime.h"
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_03.cu b/tests/hipify-clang/unit_tests/headers/headers_test_03.cu
index 5f2e479683..14735172fb 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_03.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_03.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #pragma once
 // CHECK-NEXT: #include <hip/hip_runtime.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_04.cu b/tests/hipify-clang/unit_tests/headers/headers_test_04.cu
index 57667b5a34..10a7daf41c 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_04.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_04.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 // CHECK-NEXT: #include <stdio.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_05.cu b/tests/hipify-clang/unit_tests/headers/headers_test_05.cu
index c9428b62d5..4706044b9d 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_05.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_05.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #pragma once
 // CHECK-NEXT: #include <hip/hip_runtime.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_06.cu b/tests/hipify-clang/unit_tests/headers/headers_test_06.cu
index bce73c42df..1adccd95e4 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_06.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_06.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hipblas.h>
 // CHECK-NOT: #include <cublas_v2.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_07.cu b/tests/hipify-clang/unit_tests/headers/headers_test_07.cu
index 4237e1eb72..1effc189b8 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_07.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_07.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include "hipblas.h"
 // CHECK-NOT: #include "cublas.h"
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_08.cu b/tests/hipify-clang/unit_tests/headers/headers_test_08.cu
index ad54871bd8..aca7f194b0 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_08.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_08.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 // CHECK-NOT: #include <cuda_runtime.h>
diff --git a/tests/hipify-clang/unit_tests/headers/headers_test_09.cu b/tests/hipify-clang/unit_tests/headers/headers_test_09.cu
index 13d2b688f9..37e718b5a4 100644
--- a/tests/hipify-clang/unit_tests/headers/headers_test_09.cu
+++ b/tests/hipify-clang/unit_tests/headers/headers_test_09.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 // CHECK: #include <memory>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu
index 5dcaaaf637..af24737dbc 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu
index 4e3c1cace8..6983140eac 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu
index 32692440d4..ecd8fb7eee 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu b/tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu
index 8bf9587b94..196a94197b 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 // CHECK: #include "hip/hip_complex.h"
diff --git a/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu
index e58116e22a..6aae90e403 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <iomanip>
 #include <iostream>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu
index 2356080e4d..a2052b3de6 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 #include <stdio.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu b/tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu
index 906fe93853..9c05a53fa8 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // CHECK: #include <hip/hip_runtime.h>
 #include <cuda.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp
index af30969c6f..9fb77dcf3e 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp
+++ b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
 //
diff --git a/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp
index 222e30570a..4442fb634c 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp
+++ b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved.
 //
diff --git a/tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu b/tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu
index d4cfd90e1f..4e748973d5 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Taken from: http://docs.nvidia.com/cuda/curand/device-api-overview.html#poisson-api-example
 /*
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu
index df2499c041..6e163d47a6 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 // CHECK: #include <hip/hip_runtime.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu
index de7629367f..57b2c61098 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
index ef52072576..349d6471db 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu
index 32760f4fa7..18ba9b006c 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu
index c6e7374d0b..1155af09e1 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu
index d38dcd98e4..872750a5d5 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu
index 371f836a5f..cc938d7da4 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu
index cf788c8f33..2c826935ef 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu
index 9b1aaf623f..3bcbd96bb0 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu
index 326c231de4..6690a7c296 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu
index 2d905bcf6d..868f3be69e 100644
--- a/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu
+++ b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/tests/hipify-clang/unit_tests/samples/allocators.cu b/tests/hipify-clang/unit_tests/samples/allocators.cu
index 3f130be227..a1bce9d4cc 100644
--- a/tests/hipify-clang/unit_tests/samples/allocators.cu
+++ b/tests/hipify-clang/unit_tests/samples/allocators.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #pragma once
 
diff --git a/tests/hipify-clang/unit_tests/samples/axpy.cu b/tests/hipify-clang/unit_tests/samples/axpy.cu
index 2e59fc021a..6bd1065c83 100644
--- a/tests/hipify-clang/unit_tests/samples/axpy.cu
+++ b/tests/hipify-clang/unit_tests/samples/axpy.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <iostream>
 
diff --git a/tests/hipify-clang/unit_tests/samples/coalescing.cu b/tests/hipify-clang/unit_tests/samples/coalescing.cu
index 4c04289044..ec4645d673 100644
--- a/tests/hipify-clang/unit_tests/samples/coalescing.cu
+++ b/tests/hipify-clang/unit_tests/samples/coalescing.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // To measure effects of memory coalescing. Coalescing.cu
 // B. Wilkinson Jan 30, 2011
diff --git a/tests/hipify-clang/unit_tests/samples/cudaRegister.cu b/tests/hipify-clang/unit_tests/samples/cudaRegister.cu
index 11192c452e..2cc754300a 100644
--- a/tests/hipify-clang/unit_tests/samples/cudaRegister.cu
+++ b/tests/hipify-clang/unit_tests/samples/cudaRegister.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 /*
 Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
diff --git a/tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu b/tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu
index d35718d714..9e00a9b8e3 100644
--- a/tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu
+++ b/tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Taken from Jonathan Hui blog https://jhui.github.io/2017/03/06/CUDA
 
diff --git a/tests/hipify-clang/unit_tests/samples/intro.cu b/tests/hipify-clang/unit_tests/samples/intro.cu
index da797eb2ec..5ae5479aa9 100644
--- a/tests/hipify-clang/unit_tests/samples/intro.cu
+++ b/tests/hipify-clang/unit_tests/samples/intro.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/hipify-clang/unit_tests/samples/square.cu b/tests/hipify-clang/unit_tests/samples/square.cu
index 076f9191f8..4609fd37e4 100644
--- a/tests/hipify-clang/unit_tests/samples/square.cu
+++ b/tests/hipify-clang/unit_tests/samples/square.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 /*
 Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
diff --git a/tests/hipify-clang/unit_tests/samples/static_shared_memory.cu b/tests/hipify-clang/unit_tests/samples/static_shared_memory.cu
index ea6b50488f..f53932bf74 100644
--- a/tests/hipify-clang/unit_tests/samples/static_shared_memory.cu
+++ b/tests/hipify-clang/unit_tests/samples/static_shared_memory.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Taken from Jonathan Hui blog https://jhui.github.io/2017/03/06/CUDA
 
diff --git a/tests/hipify-clang/unit_tests/samples/vec_add.cu b/tests/hipify-clang/unit_tests/samples/vec_add.cu
index ec813e8bad..bc8219bf8c 100644
--- a/tests/hipify-clang/unit_tests/samples/vec_add.cu
+++ b/tests/hipify-clang/unit_tests/samples/vec_add.cu
@@ -1,4 +1,4 @@
-// RUN: %run_test hipify "%s" "%t" %cuda_args
+// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args
 
 // Kernel definition
 __global__ void  vecAdd(float* A, float* B, float* C)