diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
index aa1a4e60e9..6e94f13c55 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
@@ -118,16 +118,6 @@
         "Unit_hipMemcpyParam2DAsync_multiDevice-StreamOnDiffDevice",
         "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/96 ===",
         "Unit_hipHostGetDevicePointer_Negative",
-        "=== Below tests fail 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",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - ulong1",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - signed long",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - long1",
-        "Unit_ChannelDescriptor_Positive_Basic_2D - ulong2",
-        "Unit_ChannelDescriptor_Positive_Basic_2D - long2",
-        "Unit_ChannelDescriptor_Positive_Basic_4D - ulong4",
-        "Unit_ChannelDescriptor_Positive_Basic_4D - long4",
         "Unit_hipExtModuleLaunchKernel_NonUniformWorkGroup",
         "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/18 ===",
         "Unit_hipMemcpyAsync_Negative_Parameters",
diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
index 402ff4ad32..d1b1b1cec0 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows
@@ -207,18 +207,6 @@
         "Unit_hipDeviceGetUuid_Positive",
         "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/96 ===",
         "Unit_hipHostGetDevicePointer_Negative",
-        "=== Below tests fail 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",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - ulong1",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - signed long",
-        "Unit_ChannelDescriptor_Positive_Basic_1D - long1",
-        "Unit_ChannelDescriptor_Positive_Basic_2D - ulong2",
-        "Unit_ChannelDescriptor_Positive_Basic_2D - long2",
-        "Unit_ChannelDescriptor_Positive_Basic_3D - ulong3",
-        "Unit_ChannelDescriptor_Positive_Basic_3D - long3",
-        "Unit_ChannelDescriptor_Positive_Basic_4D - ulong4",
-        "Unit_ChannelDescriptor_Positive_Basic_4D - long4",
         "Unit_hipExtModuleLaunchKernel_NonUniformWorkGroup",
         "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/18 ===",
         "Unit_hipMemcpyAsync_Negative_Parameters",
diff --git a/projects/hip-tests/catch/unit/channelDescriptor/channel_descriptor_common.hh b/projects/hip-tests/catch/unit/channelDescriptor/channel_descriptor_common.hh
index 47e87025be..332075a5bb 100644
--- a/projects/hip-tests/catch/unit/channelDescriptor/channel_descriptor_common.hh
+++ b/projects/hip-tests/catch/unit/channelDescriptor/channel_descriptor_common.hh
@@ -88,7 +88,9 @@ template <typename T> class ChannelDescriptorTest1D : public ChannelDescriptorTe
     } else if (std::is_same_v<float, T> || std::is_same_v<float1, T>) {
       this->size = static_cast<int>(sizeof(float) * 8);
       this->kind = hipChannelFormatKindFloat;
-    } else if (std::is_same_v<unsigned long, T> || std::is_same_v<ulong1, T>) {
+    }
+    #if !defined(__LP64__)
+    else if (std::is_same_v<unsigned long, T> || std::is_same_v<ulong1, T>) {
       this->size = static_cast<int>(sizeof(unsigned long) * 8);
       this->kind = hipChannelFormatKindUnsigned;
     } else if (std::is_same_v<long, T> || std::is_same_v<signed long, T> ||
@@ -96,6 +98,7 @@ template <typename T> class ChannelDescriptorTest1D : public ChannelDescriptorTe
       this->size = static_cast<int>(sizeof(signed long) * 8);
       this->kind = hipChannelFormatKindSigned;
     }
+    #endif
   }
 };
 
@@ -126,13 +129,16 @@ template <typename T> class ChannelDescriptorTest2D : public ChannelDescriptorTe
     } else if (std::is_same_v<float2, T>) {
       this->size = static_cast<int>(sizeof(float) * 8);
       this->kind = hipChannelFormatKindFloat;
-    } else if (std::is_same_v<ulong2, T>) {
+    }
+    #if !defined(__LP64__)
+    else if (std::is_same_v<ulong2, T>) {
       this->size = static_cast<int>(sizeof(unsigned long) * 8);
       this->kind = hipChannelFormatKindUnsigned;
     } else if (std::is_same_v<long2, T>) {
       this->size = static_cast<int>(sizeof(signed long) * 8);
       this->kind = hipChannelFormatKindSigned;
     }
+    #endif
   }
 };
 
@@ -164,13 +170,16 @@ template <typename T> class ChannelDescriptorTest3D : public ChannelDescriptorTe
     } else if (std::is_same_v<float3, T>) {
       this->size = static_cast<int>(sizeof(float) * 8);
       this->kind = hipChannelFormatKindFloat;
-    } else if (std::is_same_v<ulong3, T>) {
+    }
+    #if !defined(__LP64__)
+    else if (std::is_same_v<ulong3, T>) {
       this->size = static_cast<int>(sizeof(unsigned long) * 8);
       this->kind = hipChannelFormatKindUnsigned;
     } else if (std::is_same_v<long3, T>) {
       this->size = static_cast<int>(sizeof(signed long) * 8);
       this->kind = hipChannelFormatKindSigned;
     }
+    #endif
   }
 };
 #endif
@@ -202,13 +211,16 @@ template <typename T> class ChannelDescriptorTest4D : public ChannelDescriptorTe
     } else if (std::is_same_v<float4, T>) {
       this->size = static_cast<int>(sizeof(float) * 8);
       this->kind = hipChannelFormatKindFloat;
-    } else if (std::is_same_v<ulong4, T>) {
+    }
+    #if !defined(__LP64__)
+    else if (std::is_same_v<ulong4, T>) {
       this->size = static_cast<int>(sizeof(unsigned long) * 8);
       this->kind = hipChannelFormatKindUnsigned;
     } else if (std::is_same_v<long4, T>) {
       this->size = static_cast<int>(sizeof(signed long) * 8);
       this->kind = hipChannelFormatKindSigned;
     }
+    #endif
   }
 };