diff --git a/tests/hipify-clang/lit.cfg b/tests/hipify-clang/lit.cfg
index 76b2ca08dc..4dca50c052 100644
--- a/tests/hipify-clang/lit.cfg
+++ b/tests/hipify-clang/lit.cfg
@@ -44,8 +44,17 @@ if obj_root is not None:
     path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
 
-config.substitutions.append(("hipify", obj_root+"/hipify-clang"))
+hipify_path = obj_root
+clang_args = "-x cuda -v --cuda-gpu-arch=sm_30 --cuda-path='%s'"
 
-# Clang args for CUDA...
-config.substitutions.append(("%cuda_args", "-x cuda --cuda-path=%s --cuda-gpu-arch=sm_30 -isystem%s/samples/common/inc" % (config.cuda_root, config.cuda_root)))
-config.substitutions.append(("%run_test", config.test_source_root + "/run_test.sh"))
+if sys.platform in ['win32']:
+    run_test_ext = ".bat"
+    hipify_path += "/" + config.build_type
+    clang_args += " -isystem'%s'/common/inc -std=c++14"
+else:
+    run_test_ext = ".sh"
+    clang_args += " -isystem'%s'/samples/common/inc"
+
+config.substitutions.append(("%cuda_args", clang_args % (config.cuda_root, config.cuda_sdk_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/lit.site.cfg.in b/tests/hipify-clang/lit.site.cfg.in
index c1f6804d4d..c1095f65a9 100644
--- a/tests/hipify-clang/lit.site.cfg.in
+++ b/tests/hipify-clang/lit.site.cfg.in
@@ -1,8 +1,21 @@
 import sys
+import os
 
 config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
 config.obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
 config.cuda_root = "@CUDA_TOOLKIT_ROOT_DIR@"
+if sys.platform in ['win32']:
+    config.cuda_sdk_root = "@CUDA_SDK_ROOT_DIR@"
+    if not config.cuda_sdk_root or config.cuda_sdk_root == "CUDA_SDK_ROOT_DIR-NOTFOUND":
+        config.cuda_samples_root = os.environ.get('NVCUDASAMPLES_ROOT')
+        if not config.cuda_samples_root or config.cuda_samples_root == "NVCUDASAMPLES_ROOT-NOTFOUND":
+            lit_config.fatal('No CUDA Samples dir set! Please set CUDA_SDK_ROOT_DIR.')
+        config.cuda_sdk_root = config.cuda_samples_root
+    config.build_type = "@CMAKE_BUILD_TYPE@"
+    if not config.build_type:
+        config.build_type = "Debug"
+else:
+    config.cuda_sdk_root = config.cuda_root
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
diff --git a/tests/hipify-clang/run_test.bat b/tests/hipify-clang/run_test.bat
new file mode 100644
index 0000000000..5db0cc5043
--- /dev/null
+++ b/tests/hipify-clang/run_test.bat
@@ -0,0 +1,17 @@
+@echo off
+
+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)
+
+set HIPIFY=%1
+set IN_FILE=%2
+set TMP_FILE=%3
+
+set all_args=%*
+call set clang_args=%%all_args:*%4=%%
+set clang_args=%4%clang_args%
+
+%HIPIFY% -o=%TMP_FILE% %IN_FILE% -- %clang_args%
+if errorlevel 1 (echo      Error: hipify-clang.exe failed with exit code: %errorlevel% && exit /b %errorlevel%)
+%FILE_CHECK% %IN_FILE% -input-file=%TMP_FILE%
+if errorlevel 1 (echo      Error: FileCheck.exe failed with exit code: %errorlevel% && exit /b %errorlevel%)