diff --git a/behavior_tests/behavior_tests.xml b/behavior_tests/behavior_tests.xml
index c733c021e..76b33bb2a 100644
--- a/behavior_tests/behavior_tests.xml
+++ b/behavior_tests/behavior_tests.xml
@@ -137,6 +137,7 @@
         <test testName="check-windows-version" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="query-api-mapping" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-experimental-features" configFile="config/TEMPLATE_behavior_tests.xml" />
+        <test testName="ngt-query-api-mapping" configFile="config/TEMPLATE_behavior_tests.xml" />
     </tests>
 
 </suite>
diff --git a/behavior_tests/src/ngt-query-api-mapping/do_test.py b/behavior_tests/src/ngt-query-api-mapping/do_test.py
new file mode 100644
index 000000000..f7d39e57a
--- /dev/null
+++ b/behavior_tests/src/ngt-query-api-mapping/do_test.py
@@ -0,0 +1,29 @@
+# ====------ do_test.py---------- *- Python -* ----===##
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#
+# ===----------------------------------------------------------------------===#
+import subprocess
+import platform
+import os
+import sys
+from test_config import CT_TOOL
+
+from test_utils import *
+
+def setup_test():
+    change_dir(test_config.current_test)
+    return True
+
+def migrate_test():
+    call_subprocess(test_config.CT_TOOL + " -query-api-mapping=fail")
+    return is_sub_string("Mapping for fail is not available", test_config.command_output)
+
+def build_test():
+    return True
+
+def run_test():
+    return True
\ No newline at end of file