diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux
index d8443dba50..b07ee4e8b1 100644
--- a/catch/hipTestMain/config/config_amd_linux
+++ b/catch/hipTestMain/config/config_amd_linux
@@ -27,12 +27,8 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
-        "Unit_hipFuncSetAttribute_Positive_Parameters",
-        "Unit_hipFuncSetAttribute_Negative_Parameters",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-241",
-        "Unit_hipFuncGetAttributes_Negative_Parameters",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-242",
         "Unit_hipFuncGetAttributes_Positive_Basic",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-243",
@@ -125,7 +121,6 @@
         "Unit_Device_ilogbf_Accuracy_Positive",
         "Unit_Device_ilogb_Accuracy_Positive",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-245",
-        "Unit_hipFuncGetAttribute_Negative_Parameters",
         "Unit_hipMemCreate_MapNonContiguousChunks",
         "Unit_hipMemMap_PhysicalMemoryReuse_MultiDev",
         "Unit_hipMemMap_VMMMemoryReuse_MultiGPU",
diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows
index 28606aa6ac..5ec4bc70e4 100644
--- a/catch/hipTestMain/config/config_amd_windows
+++ b/catch/hipTestMain/config/config_amd_windows
@@ -107,10 +107,7 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
-        "Unit_hipFuncSetAttribute_Positive_Parameters",
-        "Unit_hipFuncSetAttribute_Negative_Parameters",
         "Unit_hipEventCreateWithFlags_DisableSystemFence_HstVisMem",
         "Unit_hipEventCreateWithFlags_DefaultFlg_HstVisMem",
         "Unit_hipEventCreateWithFlags_DisableSystemFence_NonCohHstMem",
@@ -213,7 +210,6 @@
         "=== Below test is disabled due to defect EXSWHTEC-347 ===",
         "Unit_hipPointerSetAttribute_Positive_SyncMemops",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-241",
-        "Unit_hipFuncGetAttributes_Negative_Parameters",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-242",
         "Unit_hipFuncGetAttributes_Positive_Basic",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-243",
@@ -225,7 +221,6 @@
         "Unit_Device_ilogbf_Accuracy_Positive",
         "Unit_Device_ilogb_Accuracy_Positive",
         "NOTE: The following test is disabled due to defect - EXSWHTEC-245",
-        "Unit_hipFuncGetAttribute_Negative_Parameters",
         "Unit_hipMemAddressFree_negative",
         "Unit_hipMemAddressReserve_AlignmentTest",
         "Unit_hipGraphAddMemcpyNode_Negative_Parameters",
diff --git a/catch/hipTestMain/config/config_amd_wsl.json b/catch/hipTestMain/config/config_amd_wsl.json
index 7dfa5f776a..0a8c6f0feb 100644
--- a/catch/hipTestMain/config/config_amd_wsl.json
+++ b/catch/hipTestMain/config/config_amd_wsl.json
@@ -95,10 +95,7 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
-        "Unit_hipFuncSetAttribute_Positive_Parameters",
-        "Unit_hipFuncSetAttribute_Negative_Parameters",
         "Unit_hipEventCreateWithFlags_DisableSystemFence_HstVisMem",
         "Unit_hipEventCreateWithFlags_DefaultFlg_HstVisMem",
         "Unit_hipEventCreateWithFlags_DisableSystemFence_NonCohHstMem",
@@ -377,10 +374,7 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
-        "Unit_hipFuncSetAttribute_Positive_Parameters",
-        "Unit_hipFuncSetAttribute_Negative_Parameters",
         "Unit_hipOccupancyMaxActiveBlocksPerMultiprocessor_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxPotentialBlockSizeWithFlags_Negative_Parameters",
diff --git a/catch/hipTestMain/config/config_nvidia_linux.json b/catch/hipTestMain/config/config_nvidia_linux.json
index 5ad958412d..eb2ae15628 100644
--- a/catch/hipTestMain/config/config_nvidia_linux.json
+++ b/catch/hipTestMain/config/config_nvidia_linux.json
@@ -1,7 +1,6 @@
 {
     "DisabledTests": [
         "=== Below test fails in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/85 ===",
-        "Unit_hipFuncSetAttribute_Negative_Parameters",
         "=== Below test fails in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/215 ===",
         "Unit_ChannelDescriptor_Positive_Basic_1D - long",
         "Unit_ChannelDescriptor_Positive_Basic_1D - unsigned long",
diff --git a/catch/unit/executionControl/hipFuncGetAttributes.cc b/catch/unit/executionControl/hipFuncGetAttributes.cc
index c3ce1c835e..ffc5d760b7 100644
--- a/catch/unit/executionControl/hipFuncGetAttributes.cc
+++ b/catch/unit/executionControl/hipFuncGetAttributes.cc
@@ -34,13 +34,9 @@ TEST_CASE("Unit_hipFuncGetAttributes_Positive_Basic") {
   HIP_CHECK(hipFuncGetAttributes(&attr, reinterpret_cast<void*>(attribute_test_kernel)));
 
   SECTION("binaryVersion") {
-#if HT_NVIDIA
     const auto major = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMajor, 0);
     const auto minor = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMinor, 0);
     REQUIRE(attr.binaryVersion == major * 10 + minor);
-#elif HT_AMD
-    REQUIRE(attr.binaryVersion > 0);
-#endif
   }
 
   SECTION("cacheModeCA") { REQUIRE((attr.cacheModeCA == 0 || attr.cacheModeCA == 1)); }
diff --git a/catch/unit/executionControl/hipFuncSetAttribute.cc b/catch/unit/executionControl/hipFuncSetAttribute.cc
index 5cf4313709..43607bc11b 100644
--- a/catch/unit/executionControl/hipFuncSetAttribute.cc
+++ b/catch/unit/executionControl/hipFuncSetAttribute.cc
@@ -181,7 +181,7 @@ TEST_CASE("Unit_hipFuncSetAttribute_Negative_Parameters") {
     // The sum of this value and the function attribute sharedSizeBytes cannot exceed the device
     // attribute cudaDevAttrMaxSharedMemoryPerBlockOptin
     int max_shared;
-    HIP_CHECK(hipDeviceGetAttribute(&max_shared, hipDeviceAttributeMaxSharedMemoryPerBlock, 0));
+    HIP_CHECK(hipDeviceGetAttribute(&max_shared, hipDeviceAttributeSharedMemPerBlockOptin, 0));
 
     hipFuncAttributes attributes;
     HIP_CHECK(hipFuncGetAttributes(&attributes, reinterpret_cast<void*>(kernel)));
diff --git a/catch/unit/module/hipFuncGetAttribute.cc b/catch/unit/module/hipFuncGetAttribute.cc
index c55b5179d3..8071fee5d7 100644
--- a/catch/unit/module/hipFuncGetAttribute.cc
+++ b/catch/unit/module/hipFuncGetAttribute.cc
@@ -39,13 +39,9 @@ TEST_CASE("Unit_hipFuncGetAttribute_Positive_Basic") {
 
   SECTION("binaryVersion") {
     HIP_CHECK(hipFuncGetAttribute(&value, HIP_FUNC_ATTRIBUTE_BINARY_VERSION, kernel));
-#if HT_NVIDIA
     const auto major = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMajor, 0);
     const auto minor = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMinor, 0);
     REQUIRE(value == major * 10 + minor);
-#elif HT_AMD
-    REQUIRE(value > 0);
-#endif
   }
 
   SECTION("cacheModeCA") {