diff --git a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux_common.json b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux_common.json
new file mode 100644
index 0000000000..8247b49e3a
--- /dev/null
+++ b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux_common.json
@@ -0,0 +1,9 @@
+{
+    "DisabledTests":
+	[
+	   "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
+	   "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
+	   "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
+	   "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported"
+	]
+}
diff --git a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows_common.json b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows_common.json
new file mode 100644
index 0000000000..8247b49e3a
--- /dev/null
+++ b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows_common.json
@@ -0,0 +1,9 @@
+{
+    "DisabledTests":
+	[
+	   "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
+	   "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
+	   "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
+	   "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported"
+	]
+}
diff --git a/projects/hip-tests/catch/unit/CMakeLists.txt b/projects/hip-tests/catch/unit/CMakeLists.txt
index ab39835390..bfb390924a 100644
--- a/projects/hip-tests/catch/unit/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/CMakeLists.txt
@@ -47,6 +47,7 @@ add_subdirectory(atomics)
 add_subdirectory(complex)
 add_subdirectory(p2p)
 add_subdirectory(gcc)
+add_subdirectory(vector_types)
 
 if(HIP_PLATFORM STREQUAL "amd")
 add_subdirectory(callback)