diff --git a/.ahub/sam/exclude.txt b/.ahub/sam/exclude.txt
index 587c42db41b..d8a415736d8 100644
--- a/.ahub/sam/exclude.txt
+++ b/.ahub/sam/exclude.txt
@@ -26,10 +26,6 @@ runtime/libs/circle-schema/include/circle_schema_generated.h
 runtime/libs/circle-schema/include/circle_traininfo_generated.h
 runtime/onert/core/src/loader/tflite_schema_generated.h
 
-# External code: Android NN API
-runtime/onert/api/nnapi/include/NeuralNetworks.h
-runtime/onert/api/nnapi/include/NeuralNetworksExtensions.h
-
 # External code: Tensorflow lite
 runtime/libs/profiling/
 
diff --git a/runtime/onert/api/CMakeLists.txt b/runtime/onert/api/CMakeLists.txt
index 8a570100629..415de1b102e 100644
--- a/runtime/onert/api/CMakeLists.txt
+++ b/runtime/onert/api/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_subdirectory(nnapi)
 add_subdirectory(nnfw)
 add_subdirectory(python)
diff --git a/runtime/onert/api/nnapi/CMakeLists.txt b/tests/libs/nnapi/CMakeLists.txt
similarity index 100%
rename from runtime/onert/api/nnapi/CMakeLists.txt
rename to tests/libs/nnapi/CMakeLists.txt
diff --git a/runtime/onert/api/nnapi/compilation.cc b/tests/libs/nnapi/compilation.cc
similarity index 100%
rename from runtime/onert/api/nnapi/compilation.cc
rename to tests/libs/nnapi/compilation.cc
diff --git a/runtime/onert/api/nnapi/event.cc b/tests/libs/nnapi/event.cc
similarity index 100%
rename from runtime/onert/api/nnapi/event.cc
rename to tests/libs/nnapi/event.cc
diff --git a/runtime/onert/api/nnapi/execution.cc b/tests/libs/nnapi/execution.cc
similarity index 100%
rename from runtime/onert/api/nnapi/execution.cc
rename to tests/libs/nnapi/execution.cc
diff --git a/runtime/onert/api/nnapi/include/NeuralNetworks.h b/tests/libs/nnapi/include/NeuralNetworks.h
similarity index 100%
rename from runtime/onert/api/nnapi/include/NeuralNetworks.h
rename to tests/libs/nnapi/include/NeuralNetworks.h
diff --git a/runtime/onert/api/nnapi/include/NeuralNetworksEx.h b/tests/libs/nnapi/include/NeuralNetworksEx.h
similarity index 100%
rename from runtime/onert/api/nnapi/include/NeuralNetworksEx.h
rename to tests/libs/nnapi/include/NeuralNetworksEx.h
diff --git a/runtime/onert/api/nnapi/include/NeuralNetworksExtensions.h b/tests/libs/nnapi/include/NeuralNetworksExtensions.h
similarity index 100%
rename from runtime/onert/api/nnapi/include/NeuralNetworksExtensions.h
rename to tests/libs/nnapi/include/NeuralNetworksExtensions.h
diff --git a/runtime/onert/api/nnapi/memory.cc b/tests/libs/nnapi/memory.cc
similarity index 100%
rename from runtime/onert/api/nnapi/memory.cc
rename to tests/libs/nnapi/memory.cc
diff --git a/runtime/onert/api/nnapi/model.cc b/tests/libs/nnapi/model.cc
similarity index 100%
rename from runtime/onert/api/nnapi/model.cc
rename to tests/libs/nnapi/model.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksCompilation.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksCompilation.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksCompilation.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksCompilation.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksCompilation.h b/tests/libs/nnapi/wrapper/ANeuralNetworksCompilation.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksCompilation.h
rename to tests/libs/nnapi/wrapper/ANeuralNetworksCompilation.h
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksEvent.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksEvent.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksEvent.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksEvent.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksEvent.h b/tests/libs/nnapi/wrapper/ANeuralNetworksEvent.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksEvent.h
rename to tests/libs/nnapi/wrapper/ANeuralNetworksEvent.h
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksExecution.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksExecution.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksExecution.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksExecution.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksExecution.h b/tests/libs/nnapi/wrapper/ANeuralNetworksExecution.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksExecution.h
rename to tests/libs/nnapi/wrapper/ANeuralNetworksExecution.h
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksMemory.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksMemory.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksMemory.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksMemory.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksMemory.h b/tests/libs/nnapi/wrapper/ANeuralNetworksMemory.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksMemory.h
rename to tests/libs/nnapi/wrapper/ANeuralNetworksMemory.h
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksModel.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksModel.cc
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.h b/tests/libs/nnapi/wrapper/ANeuralNetworksModel.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.h
rename to tests/libs/nnapi/wrapper/ANeuralNetworksModel.h
diff --git a/runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.test.cc b/tests/libs/nnapi/wrapper/ANeuralNetworksModel.test.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/ANeuralNetworksModel.test.cc
rename to tests/libs/nnapi/wrapper/ANeuralNetworksModel.test.cc
diff --git a/runtime/onert/api/nnapi/wrapper/NNAPIConvert.cc b/tests/libs/nnapi/wrapper/NNAPIConvert.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/NNAPIConvert.cc
rename to tests/libs/nnapi/wrapper/NNAPIConvert.cc
diff --git a/runtime/onert/api/nnapi/wrapper/NNAPIConvert.h b/tests/libs/nnapi/wrapper/NNAPIConvert.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/NNAPIConvert.h
rename to tests/libs/nnapi/wrapper/NNAPIConvert.h
diff --git a/runtime/onert/api/nnapi/wrapper/OperationFactory.cc b/tests/libs/nnapi/wrapper/OperationFactory.cc
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/OperationFactory.cc
rename to tests/libs/nnapi/wrapper/OperationFactory.cc
diff --git a/runtime/onert/api/nnapi/wrapper/OperationFactory.h b/tests/libs/nnapi/wrapper/OperationFactory.h
similarity index 100%
rename from runtime/onert/api/nnapi/wrapper/OperationFactory.h
rename to tests/libs/nnapi/wrapper/OperationFactory.h