diff --git a/test/testsuite/ouroboros/eh_test/RT0023-rt-eh-NativeCatchExceptionTest/jniNativeCatchExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0023-rt-eh-NativeCatchExceptionTest/jniNativeCatchExceptionTest.cpp
index 72b3b8e08f82fd775038d3112e6de497b2e62310..2fd03a6c58d755800063319560608c3a025ed728 100644
--- a/test/testsuite/ouroboros/eh_test/RT0023-rt-eh-NativeCatchExceptionTest/jniNativeCatchExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0023-rt-eh-NativeCatchExceptionTest/jniNativeCatchExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeCatchExceptionTest_nativeNativeCatchExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0024-rt-eh-NativeCodeCheckExceptionTest/jniNativeCodeCheckExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0024-rt-eh-NativeCodeCheckExceptionTest/jniNativeCodeCheckExceptionTest.cpp
index 8267d9601bcb4e752f92794f9df1cd9429ea193f..4ab347601088cf64ba5157bca005b2c9dc3b05e6 100644
--- a/test/testsuite/ouroboros/eh_test/RT0024-rt-eh-NativeCodeCheckExceptionTest/jniNativeCodeCheckExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0024-rt-eh-NativeCodeCheckExceptionTest/jniNativeCodeCheckExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeCodeCheckExceptionTest_nativeNativeCodeCheckExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0025-rt-eh-NativeNewExceptionTest/jniNativeNewExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0025-rt-eh-NativeNewExceptionTest/jniNativeNewExceptionTest.cpp
index 4fa3db51b0f392582bc3d18cfd5a71df5850eb29..4d6469c5f466c4dceded2f959d1d32d6a67c566a 100644
--- a/test/testsuite/ouroboros/eh_test/RT0025-rt-eh-NativeNewExceptionTest/jniNativeNewExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0025-rt-eh-NativeNewExceptionTest/jniNativeNewExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeNewExceptionTest_nativeNativeNewExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0026-rt-eh-NativeTryCatchNewExceptionTest/jniNativeTryCatchNewExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0026-rt-eh-NativeTryCatchNewExceptionTest/jniNativeTryCatchNewExceptionTest.cpp
index 888e5f7e3a2712544b9e8af32e57f951ae2311e6..3762aee607ecd395d84a10b960c66851d41161e6 100644
--- a/test/testsuite/ouroboros/eh_test/RT0026-rt-eh-NativeTryCatchNewExceptionTest/jniNativeTryCatchNewExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0026-rt-eh-NativeTryCatchNewExceptionTest/jniNativeTryCatchNewExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeTryCatchNewExceptionTest_nativeNativeTryCatchNewExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0027-rt-eh-NativeCodeCheckNewExceptionTest/jniNativeCodeCheckNewExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0027-rt-eh-NativeCodeCheckNewExceptionTest/jniNativeCodeCheckNewExceptionTest.cpp
index be7dabe23d809056c0fadc1a4102a61762e5214d..05c2f255681f09f85006577d34ba2a23125069eb 100644
--- a/test/testsuite/ouroboros/eh_test/RT0027-rt-eh-NativeCodeCheckNewExceptionTest/jniNativeCodeCheckNewExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0027-rt-eh-NativeCodeCheckNewExceptionTest/jniNativeCodeCheckNewExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeCodeCheckNewExceptionTest_nativeNativeCodeCheckNewExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0028-rt-eh-NativeClearExceptionTest/jniNativeClearExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0028-rt-eh-NativeClearExceptionTest/jniNativeClearExceptionTest.cpp
index 7de6df1fd6a76ebb0e923641dbd069fe08ad1109..88fe39eac4f4cdd9cc150dd248a1bcf5eaf84eda 100644
--- a/test/testsuite/ouroboros/eh_test/RT0028-rt-eh-NativeClearExceptionTest/jniNativeClearExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0028-rt-eh-NativeClearExceptionTest/jniNativeClearExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeClearExceptionTest_nativeNativeClearExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0029-rt-eh-NativeCodeCatchThrowNewExceptionTest/jniNativeCodeCatchThrowNewExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0029-rt-eh-NativeCodeCatchThrowNewExceptionTest/jniNativeCodeCatchThrowNewExceptionTest.cpp
index c03e3b963843af64bdbd7c0c6516461198ff1e8f..3216ff00b4d4364b57a8db9b74330315106a1eed 100644
--- a/test/testsuite/ouroboros/eh_test/RT0029-rt-eh-NativeCodeCatchThrowNewExceptionTest/jniNativeCodeCatchThrowNewExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0029-rt-eh-NativeCodeCatchThrowNewExceptionTest/jniNativeCodeCatchThrowNewExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeCodeCatchThrowNewExceptionTest_nativeNativeCodeCatchThrowNewExceptionTest__
diff --git a/test/testsuite/ouroboros/eh_test/RT0030-rt-eh-NativeCheckFatalErrorExceptionTest/jniNativeCheckFatalErrorExceptionTest.cpp b/test/testsuite/ouroboros/eh_test/RT0030-rt-eh-NativeCheckFatalErrorExceptionTest/jniNativeCheckFatalErrorExceptionTest.cpp
index 56f8a5b753766a3b85a7caca55caab9e38329137..136efc3afbd6bec45047556cbbd038e03aa67899 100644
--- a/test/testsuite/ouroboros/eh_test/RT0030-rt-eh-NativeCheckFatalErrorExceptionTest/jniNativeCheckFatalErrorExceptionTest.cpp
+++ b/test/testsuite/ouroboros/eh_test/RT0030-rt-eh-NativeCheckFatalErrorExceptionTest/jniNativeCheckFatalErrorExceptionTest.cpp
@@ -13,7 +13,7 @@
  * See the Mulan PSL v1 for more details.
  */
 #include <stdio.h>
-#include <nativehelper/jni.h>
+#include <jni.h>
 
 extern "C" {
 JNIEXPORT void JNICALL Java_NativeCheckFatalErrorExceptionTest_nativeNativeCheckFatalErrorExceptionTest__