diff --git a/tests/testDriver_available_apis.c b/tests/testDriver_available_apis.c
index 03f3d9f..05fd6bc 100644
--- a/tests/testDriver_available_apis.c
+++ b/tests/testDriver_available_apis.c
@@ -172,7 +172,12 @@ void test_nnpa_reduce() {
 }
 
 void test_nnpa_conv2d() {
-  bool expected_status = !isTelumI();
+  // Conv2D availability follows NNPA_CONVOLUTION + PARMBLKFORMAT_0 mapping.
+  // Do not gate this on Telum generation; derive expected support directly
+  // from currently installed function/parmblock capabilities.
+  bool expected_status =
+      (zdnn_is_nnpa_function_installed(1, NNPA_CONVOLUTION) &&
+       zdnn_is_nnpa_parmblk_fmt_installed(1, NNPA_PARMBLKFORMAT_0));
   bool status = is_operation_available(ZDNN_CONV2D);
   TEST_ASSERT_MESSAGE_FORMATTED(
       status == expected_status,
diff --git a/tests/testDriver_operation_availability_mapping.c b/tests/testDriver_operation_availability_mapping.c
new file mode 100644
index 0000000..bddfb30
--- /dev/null
+++ b/tests/testDriver_operation_availability_mapping.c
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright IBM Corp. 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "testsupport.h"
+
+#include <string.h>
+
+/*
+ * Regression tests for operation-availability mapping.
+ *
+ * These tests avoid hardware dependency by setting nnpa_query_result directly
+ * and asserting query_nnpa_op() selects the expected parmblock/function pairs.
+ */
+
+static void set_bit_128(bit128_t *field, uint8_t bit_pos) {
+  if (bit_pos < 64) {
+    field->bits_0to63 |= (uint64_t)1 << ((uint8_t)(63 - bit_pos));
+  } else if (bit_pos < 128) {
+    field->bits_64to127 |= (uint64_t)1 << ((uint8_t)(63 - (bit_pos - 64)));
+  }
+}
+
+static void set_bit_256(bit256_t *field, uint16_t bit_pos) {
+  if (bit_pos < 64) {
+    field->bits_0to63 |= (uint64_t)1 << ((uint16_t)(63 - bit_pos));
+  } else if (bit_pos < 128) {
+    field->bits_64to127 |= (uint64_t)1 << ((uint16_t)(63 - (bit_pos - 64)));
+  } else if (bit_pos < 192) {
+    field->bits_128to191 |= (uint64_t)1 << ((uint16_t)(63 - (bit_pos - 128)));
+  } else if (bit_pos < 256) {
+    field->bits_192to255 |= (uint64_t)1 << ((uint16_t)(63 - (bit_pos - 192)));
+  }
+}
+
+void setUp(void) { memset(&nnpa_query_result, 0, sizeof(nnpa_query_result)); }
+
+void tearDown(void) {}
+
+void test_conv2d_mapping_requires_parmblkformat_0(void) {
+  set_bit_256(&nnpa_query_result.installed_functions_vector, NNPA_CONVOLUTION);
+
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_0);
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_CONV2D));
+
+  memset(&nnpa_query_result.installed_parameter_block_formats, 0,
+         sizeof(nnpa_query_result.installed_parameter_block_formats));
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_1);
+  TEST_ASSERT_FALSE(query_nnpa_op(ZDNN_CONV2D));
+}
+
+void test_relu_mapping_distinguishes_parmblock_versions(void) {
+  set_bit_256(&nnpa_query_result.installed_functions_vector, NNPA_RELU);
+
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_0);
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_RELU));
+  TEST_ASSERT_FALSE(query_nnpa_op(ZDNN_LEAKY_RELU));
+
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_1);
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_RELU));
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_LEAKY_RELU));
+}
+
+void test_softmax_mapping_distinguishes_parmblock_versions(void) {
+  set_bit_256(&nnpa_query_result.installed_functions_vector, NNPA_SOFTMAX);
+
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_0);
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_SOFTMAX));
+  TEST_ASSERT_FALSE(query_nnpa_op(ZDNN_SOFTMAX_MASK));
+
+  set_bit_128(&nnpa_query_result.installed_parameter_block_formats,
+              NNPA_PARMBLKFORMAT_1);
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_SOFTMAX));
+  TEST_ASSERT_TRUE(query_nnpa_op(ZDNN_SOFTMAX_MASK));
+}
+
+int main(void) {
+  UNITY_BEGIN();
+
+  RUN_TEST(test_conv2d_mapping_requires_parmblkformat_0);
+  RUN_TEST(test_relu_mapping_distinguishes_parmblock_versions);
+  RUN_TEST(test_softmax_mapping_distinguishes_parmblock_versions);
+
+  return UNITY_END();
+}
diff --git a/zdnn/utils.c b/zdnn/utils.c
index 8334187..21d81fa 100644
--- a/zdnn/utils.c
+++ b/zdnn/utils.c
@@ -433,7 +433,9 @@ bool query_nnpa_op(zdnn_operation_apis api) {
     break;
   case ZDNN_CONV2D:
     function_code = NNPA_CONVOLUTION;
-    parmblock_format = NNPA_PARMBLKFORMAT_1;
+    // Keep availability mapping consistent with zdnn_conv2d(), which invokes
+    // NNPA_CONVOLUTION with PARMBLKFORMAT_0.
+    parmblock_format = NNPA_PARMBLKFORMAT_0;
     break;
   case ZDNN_GELU:
     function_code = NNPA_GELU;
@@ -499,4 +501,4 @@ bool is_nnpa_fc_and_parmblock_installed(uint8_t function_code,
 
   return (zdnn_is_nnpa_function_installed(1, function_code) &&
           zdnn_is_nnpa_parmblk_fmt_installed(1, parmblock_version));
-}
\ No newline at end of file
+}