diff --git a/test/Makefile.am b/test/Makefile.am
index 8bab8fd..4f7489f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = performance miscellaneous
+SUBDIRS = all-platforms
 
 if cunit_support
-    SUBDIRS += validation @platform_with_platform@
+    SUBDIRS += @platform_with_platform@
 endif
diff --git a/test/all-platforms/Makefile.am b/test/all-platforms/Makefile.am
new file mode 100644
index 0000000..af78bb6
--- /dev/null
+++ b/test/all-platforms/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =
+
+if cunit_support
+SUBDIRS += common
+endif
+
+SUBDIRS += performance miscellaneous validation
diff --git a/test/validation/common/Makefile.am b/test/all-platforms/common/Makefile.am
similarity index 100%
rename from test/validation/common/Makefile.am
rename to test/all-platforms/common/Makefile.am
diff --git a/test/validation/common/mask_common.c b/test/all-platforms/common/mask_common.c
similarity index 100%
rename from test/validation/common/mask_common.c
rename to test/all-platforms/common/mask_common.c
diff --git a/test/validation/common/mask_common.h b/test/all-platforms/common/mask_common.h
similarity index 100%
rename from test/validation/common/mask_common.h
rename to test/all-platforms/common/mask_common.h
diff --git a/test/validation/common/odp_cunit_common.c b/test/all-platforms/common/odp_cunit_common.c
similarity index 100%
rename from test/validation/common/odp_cunit_common.c
rename to test/all-platforms/common/odp_cunit_common.c
diff --git a/test/validation/common/odp_cunit_common.h b/test/all-platforms/common/odp_cunit_common.h
similarity index 100%
rename from test/validation/common/odp_cunit_common.h
rename to test/all-platforms/common/odp_cunit_common.h
diff --git a/test/all-platforms/m4/configure.m4 b/test/all-platforms/m4/configure.m4
new file mode 100644
index 0000000..14aa211
--- /dev/null
+++ b/test/all-platforms/m4/configure.m4
@@ -0,0 +1,33 @@
+m4_include([test/all-platforms/m4/miscellaneous.m4])
+m4_include([test/all-platforms/m4/performance.m4])
+m4_include([test/all-platforms/m4/validation.m4])
+
+AC_CONFIG_FILES([test/all-platforms/Makefile
+		 test/all-platforms/common/Makefile
+		 test/all-platforms/miscellaneous/Makefile
+		 test/all-platforms/performance/Makefile
+		 test/all-platforms/validation/Makefile
+		 test/all-platforms/validation/api/atomic/Makefile
+		 test/all-platforms/validation/api/barrier/Makefile
+		 test/all-platforms/validation/api/buffer/Makefile
+		 test/all-platforms/validation/api/classification/Makefile
+		 test/all-platforms/validation/api/cpumask/Makefile
+		 test/all-platforms/validation/api/crypto/Makefile
+		 test/all-platforms/validation/api/errno/Makefile
+		 test/all-platforms/validation/api/hash/Makefile
+		 test/all-platforms/validation/api/init/Makefile
+		 test/all-platforms/validation/api/lock/Makefile
+		 test/all-platforms/validation/api/Makefile
+		 test/all-platforms/validation/api/packet/Makefile
+		 test/all-platforms/validation/api/pktio/Makefile
+		 test/all-platforms/validation/api/pool/Makefile
+		 test/all-platforms/validation/api/queue/Makefile
+		 test/all-platforms/validation/api/random/Makefile
+		 test/all-platforms/validation/api/scheduler/Makefile
+		 test/all-platforms/validation/api/shmem/Makefile
+		 test/all-platforms/validation/api/std_clib/Makefile
+		 test/all-platforms/validation/api/system/Makefile
+		 test/all-platforms/validation/api/thread/Makefile
+		 test/all-platforms/validation/api/time/Makefile
+		 test/all-platforms/validation/api/timer/Makefile
+		 test/all-platforms/validation/api/traffic_mngr/Makefile])
diff --git a/test/m4/miscellaneous.m4 b/test/all-platforms/m4/miscellaneous.m4
similarity index 100%
rename from test/m4/miscellaneous.m4
rename to test/all-platforms/m4/miscellaneous.m4
diff --git a/test/m4/performance.m4 b/test/all-platforms/m4/performance.m4
similarity index 100%
rename from test/m4/performance.m4
rename to test/all-platforms/m4/performance.m4
diff --git a/test/m4/validation.m4 b/test/all-platforms/m4/validation.m4
similarity index 100%
rename from test/m4/validation.m4
rename to test/all-platforms/m4/validation.m4
diff --git a/test/miscellaneous/.gitignore b/test/all-platforms/miscellaneous/.gitignore
similarity index 100%
rename from test/miscellaneous/.gitignore
rename to test/all-platforms/miscellaneous/.gitignore
diff --git a/test/miscellaneous/Makefile.am b/test/all-platforms/miscellaneous/Makefile.am
similarity index 100%
rename from test/miscellaneous/Makefile.am
rename to test/all-platforms/miscellaneous/Makefile.am
diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/all-platforms/miscellaneous/odp_api_from_cpp.cpp
similarity index 100%
rename from test/miscellaneous/odp_api_from_cpp.cpp
rename to test/all-platforms/miscellaneous/odp_api_from_cpp.cpp
diff --git a/test/performance/.gitignore b/test/all-platforms/performance/.gitignore
similarity index 100%
rename from test/performance/.gitignore
rename to test/all-platforms/performance/.gitignore
diff --git a/test/performance/Makefile.am b/test/all-platforms/performance/Makefile.am
similarity index 100%
rename from test/performance/Makefile.am
rename to test/all-platforms/performance/Makefile.am
diff --git a/test/performance/odp_crypto.c b/test/all-platforms/performance/odp_crypto.c
similarity index 100%
rename from test/performance/odp_crypto.c
rename to test/all-platforms/performance/odp_crypto.c
diff --git a/test/performance/odp_l2fwd.c b/test/all-platforms/performance/odp_l2fwd.c
similarity index 100%
rename from test/performance/odp_l2fwd.c
rename to test/all-platforms/performance/odp_l2fwd.c
diff --git a/test/performance/odp_l2fwd_run.sh b/test/all-platforms/performance/odp_l2fwd_run.sh
similarity index 95%
rename from test/performance/odp_l2fwd_run.sh
rename to test/all-platforms/performance/odp_l2fwd_run.sh
index fc3d05d..a33bbeb 100755
--- a/test/performance/odp_l2fwd_run.sh
+++ b/test/all-platforms/performance/odp_l2fwd_run.sh
@@ -37,8 +37,8 @@ elif  [ "$ODP_PLATFORM" = "" ]; then
 	echo "$0: error: ODP_PLATFORM must be defined"
 	# not skipped as this should never happen via "make check"
 	exit 1
-elif [ -f ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env ]; then
-	. ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env
+elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then
+	. ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env
 else
 	echo "BUG: unable to find pktio_env!"
 	echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test."
diff --git a/test/performance/odp_pktio_perf.c b/test/all-platforms/performance/odp_pktio_perf.c
similarity index 100%
rename from test/performance/odp_pktio_perf.c
rename to test/all-platforms/performance/odp_pktio_perf.c
diff --git a/test/performance/odp_scheduling.c b/test/all-platforms/performance/odp_scheduling.c
similarity index 100%
rename from test/performance/odp_scheduling.c
rename to test/all-platforms/performance/odp_scheduling.c
diff --git a/test/performance/odp_scheduling_run.sh b/test/all-platforms/performance/odp_scheduling_run.sh
similarity index 100%
rename from test/performance/odp_scheduling_run.sh
rename to test/all-platforms/performance/odp_scheduling_run.sh
diff --git a/test/all-platforms/validation/Makefile.am b/test/all-platforms/validation/Makefile.am
new file mode 100644
index 0000000..5d525fb
--- /dev/null
+++ b/test/all-platforms/validation/Makefile.am
@@ -0,0 +1,3 @@
+if cunit_support
+    SUBDIRS = api
+endif
diff --git a/test/validation/.gitignore b/test/all-platforms/validation/api/.gitignore
similarity index 100%
rename from test/validation/.gitignore
rename to test/all-platforms/validation/api/.gitignore
diff --git a/test/validation/Makefile.am b/test/all-platforms/validation/api/Makefile.am
similarity index 93%
rename from test/validation/Makefile.am
rename to test/all-platforms/validation/api/Makefile.am
index 90cc549..e2d30a6 100644
--- a/test/validation/Makefile.am
+++ b/test/all-platforms/validation/api/Makefile.am
@@ -22,7 +22,7 @@ ODP_MODULES = atomic \
 	      shmem \
 	      system
 
-SUBDIRS = common $(ODP_MODULES)
+SUBDIRS = $(ODP_MODULES)
 
 #The tests will need to retain the deprecated test implementation
 AM_CFLAGS += -Wno-deprecated-declarations
diff --git a/test/validation/Makefile.inc b/test/all-platforms/validation/api/Makefile.inc
similarity index 82%
rename from test/validation/Makefile.inc
rename to test/all-platforms/validation/api/Makefile.inc
index 9f36f9d..be288ad 100644
--- a/test/validation/Makefile.inc
+++ b/test/all-platforms/validation/api/Makefile.inc
@@ -1,13 +1,13 @@
 include $(top_srcdir)/test/Makefile.inc
 
-COMMON_DIR = $(top_builddir)/test/validation/common
+COMMON_DIR = $(top_builddir)/test/all-platforms/common
 
 #the following option ensure that option '-I.' is not passed to gcc,
 #therefore distinguishing between '#include "X"' and '#include <X>'.
 #It allows common filenames (such as 'errno.h') to be used locally.
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CFLAGS += -I$(top_srcdir)/test/validation/common
+AM_CFLAGS += -I$(top_srcdir)/test/all-platforms/common
 AM_LDFLAGS += -static
 
 LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
diff --git a/test/validation/README b/test/all-platforms/validation/api/README
similarity index 100%
rename from test/validation/README
rename to test/all-platforms/validation/api/README
diff --git a/test/validation/atomic/.gitignore b/test/all-platforms/validation/api/atomic/.gitignore
similarity index 100%
rename from test/validation/atomic/.gitignore
rename to test/all-platforms/validation/api/atomic/.gitignore
diff --git a/test/validation/atomic/Makefile.am b/test/all-platforms/validation/api/atomic/Makefile.am
similarity index 100%
rename from test/validation/atomic/Makefile.am
rename to test/all-platforms/validation/api/atomic/Makefile.am
diff --git a/test/validation/atomic/atomic.c b/test/all-platforms/validation/api/atomic/atomic.c
similarity index 100%
rename from test/validation/atomic/atomic.c
rename to test/all-platforms/validation/api/atomic/atomic.c
diff --git a/test/validation/atomic/atomic.h b/test/all-platforms/validation/api/atomic/atomic.h
similarity index 100%
rename from test/validation/atomic/atomic.h
rename to test/all-platforms/validation/api/atomic/atomic.h
diff --git a/test/validation/atomic/atomic_main.c b/test/all-platforms/validation/api/atomic/atomic_main.c
similarity index 100%
rename from test/validation/atomic/atomic_main.c
rename to test/all-platforms/validation/api/atomic/atomic_main.c
diff --git a/test/validation/barrier/.gitignore b/test/all-platforms/validation/api/barrier/.gitignore
similarity index 100%
rename from test/validation/barrier/.gitignore
rename to test/all-platforms/validation/api/barrier/.gitignore
diff --git a/test/validation/barrier/Makefile.am b/test/all-platforms/validation/api/barrier/Makefile.am
similarity index 100%
rename from test/validation/barrier/Makefile.am
rename to test/all-platforms/validation/api/barrier/Makefile.am
diff --git a/test/validation/barrier/barrier.c b/test/all-platforms/validation/api/barrier/barrier.c
similarity index 100%
rename from test/validation/barrier/barrier.c
rename to test/all-platforms/validation/api/barrier/barrier.c
diff --git a/test/validation/barrier/barrier.h b/test/all-platforms/validation/api/barrier/barrier.h
similarity index 100%
rename from test/validation/barrier/barrier.h
rename to test/all-platforms/validation/api/barrier/barrier.h
diff --git a/test/validation/barrier/barrier_main.c b/test/all-platforms/validation/api/barrier/barrier_main.c
similarity index 100%
rename from test/validation/barrier/barrier_main.c
rename to test/all-platforms/validation/api/barrier/barrier_main.c
diff --git a/test/validation/buffer/.gitignore b/test/all-platforms/validation/api/buffer/.gitignore
similarity index 100%
rename from test/validation/buffer/.gitignore
rename to test/all-platforms/validation/api/buffer/.gitignore
diff --git a/test/validation/buffer/Makefile.am b/test/all-platforms/validation/api/buffer/Makefile.am
similarity index 100%
rename from test/validation/buffer/Makefile.am
rename to test/all-platforms/validation/api/buffer/Makefile.am
diff --git a/test/validation/buffer/buffer.c b/test/all-platforms/validation/api/buffer/buffer.c
similarity index 100%
rename from test/validation/buffer/buffer.c
rename to test/all-platforms/validation/api/buffer/buffer.c
diff --git a/test/validation/buffer/buffer.h b/test/all-platforms/validation/api/buffer/buffer.h
similarity index 100%
rename from test/validation/buffer/buffer.h
rename to test/all-platforms/validation/api/buffer/buffer.h
diff --git a/test/validation/buffer/buffer_main.c b/test/all-platforms/validation/api/buffer/buffer_main.c
similarity index 100%
rename from test/validation/buffer/buffer_main.c
rename to test/all-platforms/validation/api/buffer/buffer_main.c
diff --git a/test/validation/classification/.gitignore b/test/all-platforms/validation/api/classification/.gitignore
similarity index 100%
rename from test/validation/classification/.gitignore
rename to test/all-platforms/validation/api/classification/.gitignore
diff --git a/test/validation/classification/Makefile.am b/test/all-platforms/validation/api/classification/Makefile.am
similarity index 100%
rename from test/validation/classification/Makefile.am
rename to test/all-platforms/validation/api/classification/Makefile.am
diff --git a/test/validation/classification/classification.c b/test/all-platforms/validation/api/classification/classification.c
similarity index 100%
rename from test/validation/classification/classification.c
rename to test/all-platforms/validation/api/classification/classification.c
diff --git a/test/validation/classification/classification.h b/test/all-platforms/validation/api/classification/classification.h
similarity index 100%
rename from test/validation/classification/classification.h
rename to test/all-platforms/validation/api/classification/classification.h
diff --git a/test/validation/classification/classification_main.c b/test/all-platforms/validation/api/classification/classification_main.c
similarity index 100%
rename from test/validation/classification/classification_main.c
rename to test/all-platforms/validation/api/classification/classification_main.c
diff --git a/test/validation/classification/odp_classification_basic.c b/test/all-platforms/validation/api/classification/odp_classification_basic.c
similarity index 100%
rename from test/validation/classification/odp_classification_basic.c
rename to test/all-platforms/validation/api/classification/odp_classification_basic.c
diff --git a/test/validation/classification/odp_classification_common.c b/test/all-platforms/validation/api/classification/odp_classification_common.c
similarity index 100%
rename from test/validation/classification/odp_classification_common.c
rename to test/all-platforms/validation/api/classification/odp_classification_common.c
diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/all-platforms/validation/api/classification/odp_classification_test_pmr.c
similarity index 100%
rename from test/validation/classification/odp_classification_test_pmr.c
rename to test/all-platforms/validation/api/classification/odp_classification_test_pmr.c
diff --git a/test/validation/classification/odp_classification_tests.c b/test/all-platforms/validation/api/classification/odp_classification_tests.c
similarity index 100%
rename from test/validation/classification/odp_classification_tests.c
rename to test/all-platforms/validation/api/classification/odp_classification_tests.c
diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/all-platforms/validation/api/classification/odp_classification_testsuites.h
similarity index 100%
rename from test/validation/classification/odp_classification_testsuites.h
rename to test/all-platforms/validation/api/classification/odp_classification_testsuites.h
diff --git a/test/validation/cpumask/.gitignore b/test/all-platforms/validation/api/cpumask/.gitignore
similarity index 100%
rename from test/validation/cpumask/.gitignore
rename to test/all-platforms/validation/api/cpumask/.gitignore
diff --git a/test/validation/cpumask/Makefile.am b/test/all-platforms/validation/api/cpumask/Makefile.am
similarity index 100%
rename from test/validation/cpumask/Makefile.am
rename to test/all-platforms/validation/api/cpumask/Makefile.am
diff --git a/test/validation/cpumask/cpumask.c b/test/all-platforms/validation/api/cpumask/cpumask.c
similarity index 100%
rename from test/validation/cpumask/cpumask.c
rename to test/all-platforms/validation/api/cpumask/cpumask.c
diff --git a/test/validation/cpumask/cpumask.h b/test/all-platforms/validation/api/cpumask/cpumask.h
similarity index 100%
rename from test/validation/cpumask/cpumask.h
rename to test/all-platforms/validation/api/cpumask/cpumask.h
diff --git a/test/validation/cpumask/cpumask_main.c b/test/all-platforms/validation/api/cpumask/cpumask_main.c
similarity index 100%
rename from test/validation/cpumask/cpumask_main.c
rename to test/all-platforms/validation/api/cpumask/cpumask_main.c
diff --git a/test/validation/crypto/.gitignore b/test/all-platforms/validation/api/crypto/.gitignore
similarity index 100%
rename from test/validation/crypto/.gitignore
rename to test/all-platforms/validation/api/crypto/.gitignore
diff --git a/test/validation/crypto/Makefile.am b/test/all-platforms/validation/api/crypto/Makefile.am
similarity index 100%
rename from test/validation/crypto/Makefile.am
rename to test/all-platforms/validation/api/crypto/Makefile.am
diff --git a/test/validation/crypto/crypto.c b/test/all-platforms/validation/api/crypto/crypto.c
similarity index 100%
rename from test/validation/crypto/crypto.c
rename to test/all-platforms/validation/api/crypto/crypto.c
diff --git a/test/validation/crypto/crypto.h b/test/all-platforms/validation/api/crypto/crypto.h
similarity index 100%
rename from test/validation/crypto/crypto.h
rename to test/all-platforms/validation/api/crypto/crypto.h
diff --git a/test/validation/crypto/crypto_main.c b/test/all-platforms/validation/api/crypto/crypto_main.c
similarity index 100%
rename from test/validation/crypto/crypto_main.c
rename to test/all-platforms/validation/api/crypto/crypto_main.c
diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/all-platforms/validation/api/crypto/odp_crypto_test_inp.c
similarity index 100%
rename from test/validation/crypto/odp_crypto_test_inp.c
rename to test/all-platforms/validation/api/crypto/odp_crypto_test_inp.c
diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/all-platforms/validation/api/crypto/odp_crypto_test_inp.h
similarity index 100%
rename from test/validation/crypto/odp_crypto_test_inp.h
rename to test/all-platforms/validation/api/crypto/odp_crypto_test_inp.h
diff --git a/test/validation/crypto/test_vectors.h b/test/all-platforms/validation/api/crypto/test_vectors.h
similarity index 100%
rename from test/validation/crypto/test_vectors.h
rename to test/all-platforms/validation/api/crypto/test_vectors.h
diff --git a/test/validation/crypto/test_vectors_len.h b/test/all-platforms/validation/api/crypto/test_vectors_len.h
similarity index 100%
rename from test/validation/crypto/test_vectors_len.h
rename to test/all-platforms/validation/api/crypto/test_vectors_len.h
diff --git a/test/validation/errno/.gitignore b/test/all-platforms/validation/api/errno/.gitignore
similarity index 100%
rename from test/validation/errno/.gitignore
rename to test/all-platforms/validation/api/errno/.gitignore
diff --git a/test/validation/errno/Makefile.am b/test/all-platforms/validation/api/errno/Makefile.am
similarity index 100%
rename from test/validation/errno/Makefile.am
rename to test/all-platforms/validation/api/errno/Makefile.am
diff --git a/test/validation/errno/errno.c b/test/all-platforms/validation/api/errno/errno.c
similarity index 100%
rename from test/validation/errno/errno.c
rename to test/all-platforms/validation/api/errno/errno.c
diff --git a/test/validation/errno/errno.h b/test/all-platforms/validation/api/errno/errno.h
similarity index 100%
rename from test/validation/errno/errno.h
rename to test/all-platforms/validation/api/errno/errno.h
diff --git a/test/validation/errno/errno_main.c b/test/all-platforms/validation/api/errno/errno_main.c
similarity index 100%
rename from test/validation/errno/errno_main.c
rename to test/all-platforms/validation/api/errno/errno_main.c
diff --git a/test/validation/hash/.gitignore b/test/all-platforms/validation/api/hash/.gitignore
similarity index 100%
rename from test/validation/hash/.gitignore
rename to test/all-platforms/validation/api/hash/.gitignore
diff --git a/test/validation/hash/Makefile.am b/test/all-platforms/validation/api/hash/Makefile.am
similarity index 100%
rename from test/validation/hash/Makefile.am
rename to test/all-platforms/validation/api/hash/Makefile.am
diff --git a/test/validation/hash/hash.c b/test/all-platforms/validation/api/hash/hash.c
similarity index 100%
rename from test/validation/hash/hash.c
rename to test/all-platforms/validation/api/hash/hash.c
diff --git a/test/validation/hash/hash.h b/test/all-platforms/validation/api/hash/hash.h
similarity index 100%
rename from test/validation/hash/hash.h
rename to test/all-platforms/validation/api/hash/hash.h
diff --git a/test/validation/hash/hash_main.c b/test/all-platforms/validation/api/hash/hash_main.c
similarity index 100%
rename from test/validation/hash/hash_main.c
rename to test/all-platforms/validation/api/hash/hash_main.c
diff --git a/test/validation/init/.gitignore b/test/all-platforms/validation/api/init/.gitignore
similarity index 100%
rename from test/validation/init/.gitignore
rename to test/all-platforms/validation/api/init/.gitignore
diff --git a/test/validation/init/Makefile.am b/test/all-platforms/validation/api/init/Makefile.am
similarity index 100%
rename from test/validation/init/Makefile.am
rename to test/all-platforms/validation/api/init/Makefile.am
diff --git a/test/validation/init/init.c b/test/all-platforms/validation/api/init/init.c
similarity index 100%
rename from test/validation/init/init.c
rename to test/all-platforms/validation/api/init/init.c
diff --git a/test/validation/init/init.h b/test/all-platforms/validation/api/init/init.h
similarity index 100%
rename from test/validation/init/init.h
rename to test/all-platforms/validation/api/init/init.h
diff --git a/test/validation/init/init_main_abort.c b/test/all-platforms/validation/api/init/init_main_abort.c
similarity index 100%
rename from test/validation/init/init_main_abort.c
rename to test/all-platforms/validation/api/init/init_main_abort.c
diff --git a/test/validation/init/init_main_log.c b/test/all-platforms/validation/api/init/init_main_log.c
similarity index 100%
rename from test/validation/init/init_main_log.c
rename to test/all-platforms/validation/api/init/init_main_log.c
diff --git a/test/validation/init/init_main_ok.c b/test/all-platforms/validation/api/init/init_main_ok.c
similarity index 100%
rename from test/validation/init/init_main_ok.c
rename to test/all-platforms/validation/api/init/init_main_ok.c
diff --git a/test/validation/lock/.gitignore b/test/all-platforms/validation/api/lock/.gitignore
similarity index 100%
rename from test/validation/lock/.gitignore
rename to test/all-platforms/validation/api/lock/.gitignore
diff --git a/test/validation/lock/Makefile.am b/test/all-platforms/validation/api/lock/Makefile.am
similarity index 100%
rename from test/validation/lock/Makefile.am
rename to test/all-platforms/validation/api/lock/Makefile.am
diff --git a/test/validation/lock/lock.c b/test/all-platforms/validation/api/lock/lock.c
similarity index 100%
rename from test/validation/lock/lock.c
rename to test/all-platforms/validation/api/lock/lock.c
diff --git a/test/validation/lock/lock.h b/test/all-platforms/validation/api/lock/lock.h
similarity index 100%
rename from test/validation/lock/lock.h
rename to test/all-platforms/validation/api/lock/lock.h
diff --git a/test/validation/lock/lock_main.c b/test/all-platforms/validation/api/lock/lock_main.c
similarity index 100%
rename from test/validation/lock/lock_main.c
rename to test/all-platforms/validation/api/lock/lock_main.c
diff --git a/test/validation/packet/.gitignore b/test/all-platforms/validation/api/packet/.gitignore
similarity index 100%
rename from test/validation/packet/.gitignore
rename to test/all-platforms/validation/api/packet/.gitignore
diff --git a/test/validation/packet/Makefile.am b/test/all-platforms/validation/api/packet/Makefile.am
similarity index 100%
rename from test/validation/packet/Makefile.am
rename to test/all-platforms/validation/api/packet/Makefile.am
diff --git a/test/validation/packet/packet.c b/test/all-platforms/validation/api/packet/packet.c
similarity index 100%
rename from test/validation/packet/packet.c
rename to test/all-platforms/validation/api/packet/packet.c
diff --git a/test/validation/packet/packet.h b/test/all-platforms/validation/api/packet/packet.h
similarity index 100%
rename from test/validation/packet/packet.h
rename to test/all-platforms/validation/api/packet/packet.h
diff --git a/test/validation/packet/packet_main.c b/test/all-platforms/validation/api/packet/packet_main.c
similarity index 100%
rename from test/validation/packet/packet_main.c
rename to test/all-platforms/validation/api/packet/packet_main.c
diff --git a/test/validation/pktio/.gitignore b/test/all-platforms/validation/api/pktio/.gitignore
similarity index 100%
rename from test/validation/pktio/.gitignore
rename to test/all-platforms/validation/api/pktio/.gitignore
diff --git a/test/validation/pktio/Makefile.am b/test/all-platforms/validation/api/pktio/Makefile.am
similarity index 100%
rename from test/validation/pktio/Makefile.am
rename to test/all-platforms/validation/api/pktio/Makefile.am
diff --git a/test/validation/pktio/pktio.c b/test/all-platforms/validation/api/pktio/pktio.c
similarity index 100%
rename from test/validation/pktio/pktio.c
rename to test/all-platforms/validation/api/pktio/pktio.c
diff --git a/test/validation/pktio/pktio.h b/test/all-platforms/validation/api/pktio/pktio.h
similarity index 100%
rename from test/validation/pktio/pktio.h
rename to test/all-platforms/validation/api/pktio/pktio.h
diff --git a/test/validation/pktio/pktio_main.c b/test/all-platforms/validation/api/pktio/pktio_main.c
similarity index 100%
rename from test/validation/pktio/pktio_main.c
rename to test/all-platforms/validation/api/pktio/pktio_main.c
diff --git a/test/validation/pool/.gitignore b/test/all-platforms/validation/api/pool/.gitignore
similarity index 100%
rename from test/validation/pool/.gitignore
rename to test/all-platforms/validation/api/pool/.gitignore
diff --git a/test/validation/pool/Makefile.am b/test/all-platforms/validation/api/pool/Makefile.am
similarity index 100%
rename from test/validation/pool/Makefile.am
rename to test/all-platforms/validation/api/pool/Makefile.am
diff --git a/test/validation/pool/pool.c b/test/all-platforms/validation/api/pool/pool.c
similarity index 100%
rename from test/validation/pool/pool.c
rename to test/all-platforms/validation/api/pool/pool.c
diff --git a/test/validation/pool/pool.h b/test/all-platforms/validation/api/pool/pool.h
similarity index 100%
rename from test/validation/pool/pool.h
rename to test/all-platforms/validation/api/pool/pool.h
diff --git a/test/validation/pool/pool_main.c b/test/all-platforms/validation/api/pool/pool_main.c
similarity index 100%
rename from test/validation/pool/pool_main.c
rename to test/all-platforms/validation/api/pool/pool_main.c
diff --git a/test/validation/queue/.gitignore b/test/all-platforms/validation/api/queue/.gitignore
similarity index 100%
rename from test/validation/queue/.gitignore
rename to test/all-platforms/validation/api/queue/.gitignore
diff --git a/test/validation/queue/Makefile.am b/test/all-platforms/validation/api/queue/Makefile.am
similarity index 100%
rename from test/validation/queue/Makefile.am
rename to test/all-platforms/validation/api/queue/Makefile.am
diff --git a/test/validation/queue/queue.c b/test/all-platforms/validation/api/queue/queue.c
similarity index 100%
rename from test/validation/queue/queue.c
rename to test/all-platforms/validation/api/queue/queue.c
diff --git a/test/validation/queue/queue.h b/test/all-platforms/validation/api/queue/queue.h
similarity index 100%
rename from test/validation/queue/queue.h
rename to test/all-platforms/validation/api/queue/queue.h
diff --git a/test/validation/queue/queue_main.c b/test/all-platforms/validation/api/queue/queue_main.c
similarity index 100%
rename from test/validation/queue/queue_main.c
rename to test/all-platforms/validation/api/queue/queue_main.c
diff --git a/test/validation/random/.gitignore b/test/all-platforms/validation/api/random/.gitignore
similarity index 100%
rename from test/validation/random/.gitignore
rename to test/all-platforms/validation/api/random/.gitignore
diff --git a/test/validation/random/Makefile.am b/test/all-platforms/validation/api/random/Makefile.am
similarity index 100%
rename from test/validation/random/Makefile.am
rename to test/all-platforms/validation/api/random/Makefile.am
diff --git a/test/validation/random/random.c b/test/all-platforms/validation/api/random/random.c
similarity index 100%
rename from test/validation/random/random.c
rename to test/all-platforms/validation/api/random/random.c
diff --git a/test/validation/random/random.h b/test/all-platforms/validation/api/random/random.h
similarity index 100%
rename from test/validation/random/random.h
rename to test/all-platforms/validation/api/random/random.h
diff --git a/test/validation/random/random_main.c b/test/all-platforms/validation/api/random/random_main.c
similarity index 100%
rename from test/validation/random/random_main.c
rename to test/all-platforms/validation/api/random/random_main.c
diff --git a/test/validation/scheduler/.gitignore b/test/all-platforms/validation/api/scheduler/.gitignore
similarity index 100%
rename from test/validation/scheduler/.gitignore
rename to test/all-platforms/validation/api/scheduler/.gitignore
diff --git a/test/validation/scheduler/Makefile.am b/test/all-platforms/validation/api/scheduler/Makefile.am
similarity index 100%
rename from test/validation/scheduler/Makefile.am
rename to test/all-platforms/validation/api/scheduler/Makefile.am
diff --git a/test/validation/scheduler/scheduler.c b/test/all-platforms/validation/api/scheduler/scheduler.c
similarity index 100%
rename from test/validation/scheduler/scheduler.c
rename to test/all-platforms/validation/api/scheduler/scheduler.c
diff --git a/test/validation/scheduler/scheduler.h b/test/all-platforms/validation/api/scheduler/scheduler.h
similarity index 100%
rename from test/validation/scheduler/scheduler.h
rename to test/all-platforms/validation/api/scheduler/scheduler.h
diff --git a/test/validation/scheduler/scheduler_main.c b/test/all-platforms/validation/api/scheduler/scheduler_main.c
similarity index 100%
rename from test/validation/scheduler/scheduler_main.c
rename to test/all-platforms/validation/api/scheduler/scheduler_main.c
diff --git a/test/validation/shmem/.gitignore b/test/all-platforms/validation/api/shmem/.gitignore
similarity index 100%
rename from test/validation/shmem/.gitignore
rename to test/all-platforms/validation/api/shmem/.gitignore
diff --git a/test/validation/shmem/Makefile.am b/test/all-platforms/validation/api/shmem/Makefile.am
similarity index 100%
rename from test/validation/shmem/Makefile.am
rename to test/all-platforms/validation/api/shmem/Makefile.am
diff --git a/test/validation/shmem/shmem.c b/test/all-platforms/validation/api/shmem/shmem.c
similarity index 100%
rename from test/validation/shmem/shmem.c
rename to test/all-platforms/validation/api/shmem/shmem.c
diff --git a/test/validation/shmem/shmem.h b/test/all-platforms/validation/api/shmem/shmem.h
similarity index 100%
rename from test/validation/shmem/shmem.h
rename to test/all-platforms/validation/api/shmem/shmem.h
diff --git a/test/validation/shmem/shmem_main.c b/test/all-platforms/validation/api/shmem/shmem_main.c
similarity index 100%
rename from test/validation/shmem/shmem_main.c
rename to test/all-platforms/validation/api/shmem/shmem_main.c
diff --git a/test/validation/std_clib/.gitignore b/test/all-platforms/validation/api/std_clib/.gitignore
similarity index 100%
rename from test/validation/std_clib/.gitignore
rename to test/all-platforms/validation/api/std_clib/.gitignore
diff --git a/test/validation/std_clib/Makefile.am b/test/all-platforms/validation/api/std_clib/Makefile.am
similarity index 100%
rename from test/validation/std_clib/Makefile.am
rename to test/all-platforms/validation/api/std_clib/Makefile.am
diff --git a/test/validation/std_clib/std_clib.c b/test/all-platforms/validation/api/std_clib/std_clib.c
similarity index 100%
rename from test/validation/std_clib/std_clib.c
rename to test/all-platforms/validation/api/std_clib/std_clib.c
diff --git a/test/validation/std_clib/std_clib.h b/test/all-platforms/validation/api/std_clib/std_clib.h
similarity index 100%
rename from test/validation/std_clib/std_clib.h
rename to test/all-platforms/validation/api/std_clib/std_clib.h
diff --git a/test/validation/std_clib/std_clib_main.c b/test/all-platforms/validation/api/std_clib/std_clib_main.c
similarity index 100%
rename from test/validation/std_clib/std_clib_main.c
rename to test/all-platforms/validation/api/std_clib/std_clib_main.c
diff --git a/test/validation/system/.gitignore b/test/all-platforms/validation/api/system/.gitignore
similarity index 100%
rename from test/validation/system/.gitignore
rename to test/all-platforms/validation/api/system/.gitignore
diff --git a/test/validation/system/Makefile.am b/test/all-platforms/validation/api/system/Makefile.am
similarity index 100%
rename from test/validation/system/Makefile.am
rename to test/all-platforms/validation/api/system/Makefile.am
diff --git a/test/validation/system/system.c b/test/all-platforms/validation/api/system/system.c
similarity index 100%
rename from test/validation/system/system.c
rename to test/all-platforms/validation/api/system/system.c
diff --git a/test/validation/system/system.h b/test/all-platforms/validation/api/system/system.h
similarity index 100%
rename from test/validation/system/system.h
rename to test/all-platforms/validation/api/system/system.h
diff --git a/test/validation/system/system_main.c b/test/all-platforms/validation/api/system/system_main.c
similarity index 100%
rename from test/validation/system/system_main.c
rename to test/all-platforms/validation/api/system/system_main.c
diff --git a/test/validation/thread/.gitignore b/test/all-platforms/validation/api/thread/.gitignore
similarity index 100%
rename from test/validation/thread/.gitignore
rename to test/all-platforms/validation/api/thread/.gitignore
diff --git a/test/validation/thread/Makefile.am b/test/all-platforms/validation/api/thread/Makefile.am
similarity index 100%
rename from test/validation/thread/Makefile.am
rename to test/all-platforms/validation/api/thread/Makefile.am
diff --git a/test/validation/thread/thread.c b/test/all-platforms/validation/api/thread/thread.c
similarity index 100%
rename from test/validation/thread/thread.c
rename to test/all-platforms/validation/api/thread/thread.c
diff --git a/test/validation/thread/thread.h b/test/all-platforms/validation/api/thread/thread.h
similarity index 100%
rename from test/validation/thread/thread.h
rename to test/all-platforms/validation/api/thread/thread.h
diff --git a/test/validation/thread/thread_main.c b/test/all-platforms/validation/api/thread/thread_main.c
similarity index 100%
rename from test/validation/thread/thread_main.c
rename to test/all-platforms/validation/api/thread/thread_main.c
diff --git a/test/validation/time/.gitignore b/test/all-platforms/validation/api/time/.gitignore
similarity index 100%
rename from test/validation/time/.gitignore
rename to test/all-platforms/validation/api/time/.gitignore
diff --git a/test/validation/time/Makefile.am b/test/all-platforms/validation/api/time/Makefile.am
similarity index 100%
rename from test/validation/time/Makefile.am
rename to test/all-platforms/validation/api/time/Makefile.am
diff --git a/test/validation/time/time.c b/test/all-platforms/validation/api/time/time.c
similarity index 100%
rename from test/validation/time/time.c
rename to test/all-platforms/validation/api/time/time.c
diff --git a/test/validation/time/time.h b/test/all-platforms/validation/api/time/time.h
similarity index 100%
rename from test/validation/time/time.h
rename to test/all-platforms/validation/api/time/time.h
diff --git a/test/validation/time/time_main.c b/test/all-platforms/validation/api/time/time_main.c
similarity index 100%
rename from test/validation/time/time_main.c
rename to test/all-platforms/validation/api/time/time_main.c
diff --git a/test/validation/timer/.gitignore b/test/all-platforms/validation/api/timer/.gitignore
similarity index 100%
rename from test/validation/timer/.gitignore
rename to test/all-platforms/validation/api/timer/.gitignore
diff --git a/test/validation/timer/Makefile.am b/test/all-platforms/validation/api/timer/Makefile.am
similarity index 100%
rename from test/validation/timer/Makefile.am
rename to test/all-platforms/validation/api/timer/Makefile.am
diff --git a/test/validation/timer/timer.c b/test/all-platforms/validation/api/timer/timer.c
similarity index 100%
rename from test/validation/timer/timer.c
rename to test/all-platforms/validation/api/timer/timer.c
diff --git a/test/validation/timer/timer.h b/test/all-platforms/validation/api/timer/timer.h
similarity index 100%
rename from test/validation/timer/timer.h
rename to test/all-platforms/validation/api/timer/timer.h
diff --git a/test/validation/timer/timer_main.c b/test/all-platforms/validation/api/timer/timer_main.c
similarity index 100%
rename from test/validation/timer/timer_main.c
rename to test/all-platforms/validation/api/timer/timer_main.c
diff --git a/test/validation/traffic_mngr/.gitignore b/test/all-platforms/validation/api/traffic_mngr/.gitignore
similarity index 100%
rename from test/validation/traffic_mngr/.gitignore
rename to test/all-platforms/validation/api/traffic_mngr/.gitignore
diff --git a/test/validation/traffic_mngr/Makefile.am b/test/all-platforms/validation/api/traffic_mngr/Makefile.am
similarity index 100%
rename from test/validation/traffic_mngr/Makefile.am
rename to test/all-platforms/validation/api/traffic_mngr/Makefile.am
diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/all-platforms/validation/api/traffic_mngr/traffic_mngr.c
similarity index 100%
rename from test/validation/traffic_mngr/traffic_mngr.c
rename to test/all-platforms/validation/api/traffic_mngr/traffic_mngr.c
diff --git a/test/validation/traffic_mngr/traffic_mngr.h b/test/all-platforms/validation/api/traffic_mngr/traffic_mngr.h
similarity index 100%
rename from test/validation/traffic_mngr/traffic_mngr.h
rename to test/all-platforms/validation/api/traffic_mngr/traffic_mngr.h
diff --git a/test/validation/traffic_mngr/traffic_mngr_main.c b/test/all-platforms/validation/api/traffic_mngr/traffic_mngr_main.c
similarity index 100%
rename from test/validation/traffic_mngr/traffic_mngr_main.c
rename to test/all-platforms/validation/api/traffic_mngr/traffic_mngr_main.c
diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index 5a74809..736d56e 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -1,32 +1,3 @@
-m4_include([test/m4/miscellaneous.m4])
-m4_include([test/m4/performance.m4])
-m4_include([test/m4/validation.m4])
+m4_include([test/all-platforms/m4/configure.m4])
 
-AC_CONFIG_FILES([test/Makefile
-		 test/miscellaneous/Makefile
-		 test/performance/Makefile
-		 test/validation/atomic/Makefile
-		 test/validation/barrier/Makefile
-		 test/validation/buffer/Makefile
-		 test/validation/classification/Makefile
-		 test/validation/common/Makefile
-		 test/validation/cpumask/Makefile
-		 test/validation/crypto/Makefile
-		 test/validation/errno/Makefile
-		 test/validation/hash/Makefile
-		 test/validation/init/Makefile
-		 test/validation/lock/Makefile
-		 test/validation/Makefile
-		 test/validation/packet/Makefile
-		 test/validation/pktio/Makefile
-		 test/validation/pool/Makefile
-		 test/validation/queue/Makefile
-		 test/validation/random/Makefile
-		 test/validation/scheduler/Makefile
-		 test/validation/shmem/Makefile
-		 test/validation/std_clib/Makefile
-		 test/validation/system/Makefile
-		 test/validation/thread/Makefile
-		 test/validation/time/Makefile
-		 test/validation/timer/Makefile
-		 test/validation/traffic_mngr/Makefile])
+AC_CONFIG_FILES([test/Makefile])
diff --git a/test/platform/linux-generic/Makefile.am b/test/platform/linux-generic/Makefile.am
index 2d58c57..08c37c2 100644
--- a/test/platform/linux-generic/Makefile.am
+++ b/test/platform/linux-generic/Makefile.am
@@ -1,39 +1,41 @@
 include $(top_srcdir)/test/Makefile.inc
-TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
+TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/all-platforms/validation
 
 ODP_MODULES = pktio \
 	      ring \
 	      shmem
 
+ALL_API_VALIDATION_DIR = ${top_builddir}/test/all-platforms/validation/api
+
 if test_vald
 TESTS = pktio/pktio_run.sh \
 	pktio/pktio_run_tap.sh \
 	ring/ring_main$(EXEEXT) \
 	shmem/shmem_linux \
-	${top_builddir}/test/validation/atomic/atomic_main$(EXEEXT) \
-	${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \
-	${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \
-	${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \
-	${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \
-	${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \
-	${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \
-	${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \
-	${top_builddir}/test/validation/lock/lock_main$(EXEEXT) \
-	${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \
-	${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \
-	${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \
-	${top_builddir}/test/validation/random/random_main$(EXEEXT) \
-	${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \
-	${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \
-	${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \
-	${top_builddir}/test/validation/time/time_main$(EXEEXT) \
-	${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \
-	${top_builddir}/test/validation/traffic_mngr/traffic_mngr_main$(EXEEXT) \
-	${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \
-	${top_builddir}/test/validation/system/system_main$(EXEEXT)
+	$(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/errno/errno_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/hash/hash_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/queue/queue_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/random/random_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/scheduler/scheduler_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/std_clib/std_clib_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/time/time_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \
+	$(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT)
 
 SUBDIRS = $(ODP_MODULES)
 
diff --git a/test/platform/linux-generic/Makefile.inc b/test/platform/linux-generic/Makefile.inc
index 80b66ae..16cc222 100644
--- a/test/platform/linux-generic/Makefile.inc
+++ b/test/platform/linux-generic/Makefile.inc
@@ -4,11 +4,11 @@
 
 AM_LDFLAGS += -static
 
-LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la
+LIBCUNIT_COMMON = $(top_builddir)/test/all-platforms/common/libcunit_common.la
 LIB   = $(top_builddir)/lib
 LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
 
-INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common
+INCCUNIT_COMMON = -I$(top_srcdir)/test/all-platforms/common
 INCODP = -I$(top_srcdir)/test \
 	 -I$(top_srcdir)/platform/@with_platform@/include \
 	 -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \
diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh
index 1dc1f44..0905b8b 100755
--- a/test/platform/linux-generic/pktio/pktio_run.sh
+++ b/test/platform/linux-generic/pktio/pktio_run.sh
@@ -21,9 +21,9 @@
 # -in the validation when running standalone (./pktio_run) intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/pktio:$PATH
+PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH
+PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh
index fd552c6..4d16b29 100755
--- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh
@@ -21,9 +21,9 @@
 # -in the validation when running standalone (./pktio_run) intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/pktio:$PATH
+PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH
+PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh
index b651ea3..6fd271b 100755
--- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_netmap.sh
@@ -15,9 +15,9 @@
 # -in the validation when running standalone (./pktio_run) intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/pktio:$PATH
+PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH
+PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh
index 51716fb..721141a 100755
--- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_pcap.sh
@@ -15,9 +15,9 @@
 # -in the validation when running standalone intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/pktio:$PATH
+PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH
+PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh
index 1150158..96f6d5a 100755
--- a/test/platform/linux-generic/pktio/pktio_run_tap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_tap.sh
@@ -16,9 +16,9 @@
 # -in the validation when running standalone intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/pktio:$PATH
+PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH
+PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
