161 files changed, 92 insertions, 76 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 8bab8fd5b..59532c811 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = performance miscellaneous
+SUBDIRS = common_plat
 
 if cunit_support
-    SUBDIRS += validation @platform_with_platform@
+    SUBDIRS += @platform_with_platform@
 endif
diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am
new file mode 100644
index 000000000..af78bb653
--- /dev/null
+++ b/test/common_plat/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/common_plat/common/Makefile.am
index fd41fb428..fd41fb428 100644
--- a/test/validation/common/Makefile.am
+++ b/test/common_plat/common/Makefile.am
diff --git a/test/validation/common/mask_common.c b/test/common_plat/common/mask_common.c
index b31534c64..b31534c64 100644
--- a/test/validation/common/mask_common.c
+++ b/test/common_plat/common/mask_common.c
diff --git a/test/validation/common/mask_common.h b/test/common_plat/common/mask_common.h
index e7a38a7c7..e7a38a7c7 100644
--- a/test/validation/common/mask_common.h
+++ b/test/common_plat/common/mask_common.h
diff --git a/test/validation/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c
index 2337c92b0..2337c92b0 100644
--- a/test/validation/common/odp_cunit_common.c
+++ b/test/common_plat/common/odp_cunit_common.c
diff --git a/test/validation/common/odp_cunit_common.h b/test/common_plat/common/odp_cunit_common.h
index 486a5ec51..486a5ec51 100644
--- a/test/validation/common/odp_cunit_common.h
+++ b/test/common_plat/common/odp_cunit_common.h
diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4
new file mode 100644
index 000000000..be878bd7d
--- /dev/null
+++ b/test/common_plat/m4/configure.m4
@@ -0,0 +1,33 @@
+m4_include([test/common_plat/m4/miscellaneous.m4])
+m4_include([test/common_plat/m4/performance.m4])
+m4_include([test/common_plat/m4/validation.m4])
+
+AC_CONFIG_FILES([test/common_plat/Makefile
+		 test/common_plat/common/Makefile
+		 test/common_plat/miscellaneous/Makefile
+		 test/common_plat/performance/Makefile
+		 test/common_plat/validation/Makefile
+		 test/common_plat/validation/api/atomic/Makefile
+		 test/common_plat/validation/api/barrier/Makefile
+		 test/common_plat/validation/api/buffer/Makefile
+		 test/common_plat/validation/api/classification/Makefile
+		 test/common_plat/validation/api/cpumask/Makefile
+		 test/common_plat/validation/api/crypto/Makefile
+		 test/common_plat/validation/api/errno/Makefile
+		 test/common_plat/validation/api/hash/Makefile
+		 test/common_plat/validation/api/init/Makefile
+		 test/common_plat/validation/api/lock/Makefile
+		 test/common_plat/validation/api/Makefile
+		 test/common_plat/validation/api/packet/Makefile
+		 test/common_plat/validation/api/pktio/Makefile
+		 test/common_plat/validation/api/pool/Makefile
+		 test/common_plat/validation/api/queue/Makefile
+		 test/common_plat/validation/api/random/Makefile
+		 test/common_plat/validation/api/scheduler/Makefile
+		 test/common_plat/validation/api/shmem/Makefile
+		 test/common_plat/validation/api/std_clib/Makefile
+		 test/common_plat/validation/api/system/Makefile
+		 test/common_plat/validation/api/thread/Makefile
+		 test/common_plat/validation/api/time/Makefile
+		 test/common_plat/validation/api/timer/Makefile
+		 test/common_plat/validation/api/traffic_mngr/Makefile])
diff --git a/test/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4
index cc881edb7..cc881edb7 100644
--- a/test/m4/miscellaneous.m4
+++ b/test/common_plat/m4/miscellaneous.m4
diff --git a/test/m4/performance.m4 b/test/common_plat/m4/performance.m4
index 1e2000d97..1e2000d97 100644
--- a/test/m4/performance.m4
+++ b/test/common_plat/m4/performance.m4
diff --git a/test/m4/validation.m4 b/test/common_plat/m4/validation.m4
index d32f675ae..d32f675ae 100644
--- a/test/m4/validation.m4
+++ b/test/common_plat/m4/validation.m4
diff --git a/test/miscellaneous/.gitignore b/test/common_plat/miscellaneous/.gitignore
index 6e555c58e..6e555c58e 100644
--- a/test/miscellaneous/.gitignore
+++ b/test/common_plat/miscellaneous/.gitignore
diff --git a/test/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am
index 7d8cf3531..7d8cf3531 100644
--- a/test/miscellaneous/Makefile.am
+++ b/test/common_plat/miscellaneous/Makefile.am
diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp
index be74c275c..be74c275c 100644
--- a/test/miscellaneous/odp_api_from_cpp.cpp
+++ b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp
diff --git a/test/performance/.gitignore b/test/common_plat/performance/.gitignore
index edcc83292..edcc83292 100644
--- a/test/performance/.gitignore
+++ b/test/common_plat/performance/.gitignore
diff --git a/test/performance/Makefile.am b/test/common_plat/performance/Makefile.am
index d23bb3e51..d23bb3e51 100644
--- a/test/performance/Makefile.am
+++ b/test/common_plat/performance/Makefile.am
diff --git a/test/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index 49a9f4b6f..49a9f4b6f 100644
--- a/test/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
diff --git a/test/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c
index 418382dc1..418382dc1 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/common_plat/performance/odp_l2fwd.c
diff --git a/test/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh
index 1fff087f2..68e4498a6 100755
--- a/test/performance/odp_l2fwd_run.sh
+++ b/test/common_plat/performance/odp_l2fwd_run.sh
@@ -25,7 +25,7 @@ TEST_DIR="${TEST_DIR:-$PWD}"
 # directory where test sources are, including scripts
 TEST_SRC_DIR=$(dirname $0)
 
-PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH
+PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH
 
 # exit codes expected by automake for skipped tests
 TEST_SKIPPED=77
@@ -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/common_plat/performance/odp_pktio_perf.c
index f041b1325..f041b1325 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/common_plat/performance/odp_pktio_perf.c
diff --git a/test/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c
index 5a2997fd1..5a2997fd1 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/common_plat/performance/odp_scheduling.c
diff --git a/test/performance/odp_scheduling_run.sh b/test/common_plat/performance/odp_scheduling_run.sh
index 755b0c1f7..755b0c1f7 100755
--- a/test/performance/odp_scheduling_run.sh
+++ b/test/common_plat/performance/odp_scheduling_run.sh
diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am
new file mode 100644
index 000000000..5d525fba4
--- /dev/null
+++ b/test/common_plat/validation/Makefile.am
@@ -0,0 +1,3 @@
+if cunit_support
+    SUBDIRS = api
+endif
diff --git a/test/validation/.gitignore b/test/common_plat/validation/api/.gitignore
index 7e563b8b3..7e563b8b3 100644
--- a/test/validation/.gitignore
+++ b/test/common_plat/validation/api/.gitignore
diff --git a/test/validation/Makefile.am b/test/common_plat/validation/api/Makefile.am
index 90cc5498f..e2d30a673 100644
--- a/test/validation/Makefile.am
+++ b/test/common_plat/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/common_plat/validation/api/Makefile.inc
index 9f36f9daa..ffba62013 100644
--- a/test/validation/Makefile.inc
+++ b/test/common_plat/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/common_plat/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/common_plat/common
 AM_LDFLAGS += -static
 
 LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
diff --git a/test/validation/README b/test/common_plat/validation/api/README
index 1baebaafc..1baebaafc 100644
--- a/test/validation/README
+++ b/test/common_plat/validation/api/README
diff --git a/test/validation/atomic/.gitignore b/test/common_plat/validation/api/atomic/.gitignore
index 610ffeab0..610ffeab0 100644
--- a/test/validation/atomic/.gitignore
+++ b/test/common_plat/validation/api/atomic/.gitignore
diff --git a/test/validation/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am
index 9b6bd6315..9b6bd6315 100644
--- a/test/validation/atomic/Makefile.am
+++ b/test/common_plat/validation/api/atomic/Makefile.am
diff --git a/test/validation/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c
index c4e934525..c4e934525 100644
--- a/test/validation/atomic/atomic.c
+++ b/test/common_plat/validation/api/atomic/atomic.c
diff --git a/test/validation/atomic/atomic.h b/test/common_plat/validation/api/atomic/atomic.h
index 4ea837b7a..4ea837b7a 100644
--- a/test/validation/atomic/atomic.h
+++ b/test/common_plat/validation/api/atomic/atomic.h
diff --git a/test/validation/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c
index db035373e..db035373e 100644
--- a/test/validation/atomic/atomic_main.c
+++ b/test/common_plat/validation/api/atomic/atomic_main.c
diff --git a/test/validation/barrier/.gitignore b/test/common_plat/validation/api/barrier/.gitignore
index 2e0ee7ade..2e0ee7ade 100644
--- a/test/validation/barrier/.gitignore
+++ b/test/common_plat/validation/api/barrier/.gitignore
diff --git a/test/validation/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am
index 8fc632c27..8fc632c27 100644
--- a/test/validation/barrier/Makefile.am
+++ b/test/common_plat/validation/api/barrier/Makefile.am
diff --git a/test/validation/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c
index d4583884a..d4583884a 100644
--- a/test/validation/barrier/barrier.c
+++ b/test/common_plat/validation/api/barrier/barrier.c
diff --git a/test/validation/barrier/barrier.h b/test/common_plat/validation/api/barrier/barrier.h
index e4890e0f4..e4890e0f4 100644
--- a/test/validation/barrier/barrier.h
+++ b/test/common_plat/validation/api/barrier/barrier.h
diff --git a/test/validation/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c
index 064decf6c..064decf6c 100644
--- a/test/validation/barrier/barrier_main.c
+++ b/test/common_plat/validation/api/barrier/barrier_main.c
diff --git a/test/validation/buffer/.gitignore b/test/common_plat/validation/api/buffer/.gitignore
index 0e8ac15c1..0e8ac15c1 100644
--- a/test/validation/buffer/.gitignore
+++ b/test/common_plat/validation/api/buffer/.gitignore
diff --git a/test/validation/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am
index add2a3419..add2a3419 100644
--- a/test/validation/buffer/Makefile.am
+++ b/test/common_plat/validation/api/buffer/Makefile.am
diff --git a/test/validation/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c
index d26d5e82e..d26d5e82e 100644
--- a/test/validation/buffer/buffer.c
+++ b/test/common_plat/validation/api/buffer/buffer.c
diff --git a/test/validation/buffer/buffer.h b/test/common_plat/validation/api/buffer/buffer.h
index 48331e3f1..48331e3f1 100644
--- a/test/validation/buffer/buffer.h
+++ b/test/common_plat/validation/api/buffer/buffer.h
diff --git a/test/validation/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c
index 47168f8b9..47168f8b9 100644
--- a/test/validation/buffer/buffer_main.c
+++ b/test/common_plat/validation/api/buffer/buffer_main.c
diff --git a/test/validation/classification/.gitignore b/test/common_plat/validation/api/classification/.gitignore
index e2cdfefe1..e2cdfefe1 100644
--- a/test/validation/classification/.gitignore
+++ b/test/common_plat/validation/api/classification/.gitignore
diff --git a/test/validation/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am
index df382c51f..df382c51f 100644
--- a/test/validation/classification/Makefile.am
+++ b/test/common_plat/validation/api/classification/Makefile.am
diff --git a/test/validation/classification/classification.c b/test/common_plat/validation/api/classification/classification.c
index 1032e7f1f..1032e7f1f 100644
--- a/test/validation/classification/classification.c
+++ b/test/common_plat/validation/api/classification/classification.c
diff --git a/test/validation/classification/classification.h b/test/common_plat/validation/api/classification/classification.h
index d73c82161..d73c82161 100644
--- a/test/validation/classification/classification.h
+++ b/test/common_plat/validation/api/classification/classification.h
diff --git a/test/validation/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c
index 8902463c2..8902463c2 100644
--- a/test/validation/classification/classification_main.c
+++ b/test/common_plat/validation/api/classification/classification_main.c
diff --git a/test/validation/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c
index 372377d85..372377d85 100644
--- a/test/validation/classification/odp_classification_basic.c
+++ b/test/common_plat/validation/api/classification/odp_classification_basic.c
diff --git a/test/validation/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c
index 7a42ac745..7a42ac745 100644
--- a/test/validation/classification/odp_classification_common.c
+++ b/test/common_plat/validation/api/classification/odp_classification_common.c
diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
index c8bbf50b5..c8bbf50b5 100644
--- a/test/validation/classification/odp_classification_test_pmr.c
+++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
diff --git a/test/validation/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c
index ed45518be..ed45518be 100644
--- a/test/validation/classification/odp_classification_tests.c
+++ b/test/common_plat/validation/api/classification/odp_classification_tests.c
diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h
index aea3de1b1..aea3de1b1 100644
--- a/test/validation/classification/odp_classification_testsuites.h
+++ b/test/common_plat/validation/api/classification/odp_classification_testsuites.h
diff --git a/test/validation/cpumask/.gitignore b/test/common_plat/validation/api/cpumask/.gitignore
index 655a1640f..655a1640f 100644
--- a/test/validation/cpumask/.gitignore
+++ b/test/common_plat/validation/api/cpumask/.gitignore
diff --git a/test/validation/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am
index ec5fce338..ec5fce338 100644
--- a/test/validation/cpumask/Makefile.am
+++ b/test/common_plat/validation/api/cpumask/Makefile.am
diff --git a/test/validation/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c
index a0cb559fb..a0cb559fb 100644
--- a/test/validation/cpumask/cpumask.c
+++ b/test/common_plat/validation/api/cpumask/cpumask.c
diff --git a/test/validation/cpumask/cpumask.h b/test/common_plat/validation/api/cpumask/cpumask.h
index 87a4512bf..87a4512bf 100644
--- a/test/validation/cpumask/cpumask.h
+++ b/test/common_plat/validation/api/cpumask/cpumask.h
diff --git a/test/validation/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c
index 39e3171ca..39e3171ca 100644
--- a/test/validation/cpumask/cpumask_main.c
+++ b/test/common_plat/validation/api/cpumask/cpumask_main.c
diff --git a/test/validation/crypto/.gitignore b/test/common_plat/validation/api/crypto/.gitignore
index 0ac55e35e..0ac55e35e 100644
--- a/test/validation/crypto/.gitignore
+++ b/test/common_plat/validation/api/crypto/.gitignore
diff --git a/test/validation/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am
index 3ea41b41f..3ea41b41f 100644
--- a/test/validation/crypto/Makefile.am
+++ b/test/common_plat/validation/api/crypto/Makefile.am
diff --git a/test/validation/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c
index 8946cde62..8946cde62 100644
--- a/test/validation/crypto/crypto.c
+++ b/test/common_plat/validation/api/crypto/crypto.c
diff --git a/test/validation/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h
index 9b909aa04..9b909aa04 100644
--- a/test/validation/crypto/crypto.h
+++ b/test/common_plat/validation/api/crypto/crypto.h
diff --git a/test/validation/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c
index d8c26fa25..d8c26fa25 100644
--- a/test/validation/crypto/crypto_main.c
+++ b/test/common_plat/validation/api/crypto/crypto_main.c
diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 4ac4a0700..4ac4a0700 100644
--- a/test/validation/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h
index 8bda34472..8bda34472 100644
--- a/test/validation/crypto/odp_crypto_test_inp.h
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h
diff --git a/test/validation/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h
index da4610f33..da4610f33 100644
--- a/test/validation/crypto/test_vectors.h
+++ b/test/common_plat/validation/api/crypto/test_vectors.h
diff --git a/test/validation/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h
index 4fbb5cd70..4fbb5cd70 100644
--- a/test/validation/crypto/test_vectors_len.h
+++ b/test/common_plat/validation/api/crypto/test_vectors_len.h
diff --git a/test/validation/errno/.gitignore b/test/common_plat/validation/api/errno/.gitignore
index 12256e38c..12256e38c 100644
--- a/test/validation/errno/.gitignore
+++ b/test/common_plat/validation/api/errno/.gitignore
diff --git a/test/validation/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am
index a24275d6e..a24275d6e 100644
--- a/test/validation/errno/Makefile.am
+++ b/test/common_plat/validation/api/errno/Makefile.am
diff --git a/test/validation/errno/errno.c b/test/common_plat/validation/api/errno/errno.c
index e3b6ced54..e3b6ced54 100644
--- a/test/validation/errno/errno.c
+++ b/test/common_plat/validation/api/errno/errno.c
diff --git a/test/validation/errno/errno.h b/test/common_plat/validation/api/errno/errno.h
index 720385196..720385196 100644
--- a/test/validation/errno/errno.h
+++ b/test/common_plat/validation/api/errno/errno.h
diff --git a/test/validation/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c
index 0138279ef..0138279ef 100644
--- a/test/validation/errno/errno_main.c
+++ b/test/common_plat/validation/api/errno/errno_main.c
diff --git a/test/validation/hash/.gitignore b/test/common_plat/validation/api/hash/.gitignore
index 6d0bc9314..6d0bc9314 100644
--- a/test/validation/hash/.gitignore
+++ b/test/common_plat/validation/api/hash/.gitignore
diff --git a/test/validation/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am
index b899b8bd3..b899b8bd3 100644
--- a/test/validation/hash/Makefile.am
+++ b/test/common_plat/validation/api/hash/Makefile.am
diff --git a/test/validation/hash/hash.c b/test/common_plat/validation/api/hash/hash.c
index b353fcecd..b353fcecd 100644
--- a/test/validation/hash/hash.c
+++ b/test/common_plat/validation/api/hash/hash.c
diff --git a/test/validation/hash/hash.h b/test/common_plat/validation/api/hash/hash.h
index 936571e6a..936571e6a 100644
--- a/test/validation/hash/hash.h
+++ b/test/common_plat/validation/api/hash/hash.h
diff --git a/test/validation/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c
index f9818b7bb..f9818b7bb 100644
--- a/test/validation/hash/hash_main.c
+++ b/test/common_plat/validation/api/hash/hash_main.c
diff --git a/test/validation/init/.gitignore b/test/common_plat/validation/api/init/.gitignore
index f433708b0..f433708b0 100644
--- a/test/validation/init/.gitignore
+++ b/test/common_plat/validation/api/init/.gitignore
diff --git a/test/validation/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am
index 0793e6423..0793e6423 100644
--- a/test/validation/init/Makefile.am
+++ b/test/common_plat/validation/api/init/Makefile.am
diff --git a/test/validation/init/init.c b/test/common_plat/validation/api/init/init.c
index 61055fad5..61055fad5 100644
--- a/test/validation/init/init.c
+++ b/test/common_plat/validation/api/init/init.c
diff --git a/test/validation/init/init.h b/test/common_plat/validation/api/init/init.h
index cad9cf988..cad9cf988 100644
--- a/test/validation/init/init.h
+++ b/test/common_plat/validation/api/init/init.h
diff --git a/test/validation/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c
index 2e0faafb8..2e0faafb8 100644
--- a/test/validation/init/init_main_abort.c
+++ b/test/common_plat/validation/api/init/init_main_abort.c
diff --git a/test/validation/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c
index 41dd00d72..41dd00d72 100644
--- a/test/validation/init/init_main_log.c
+++ b/test/common_plat/validation/api/init/init_main_log.c
diff --git a/test/validation/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c
index 6053ec188..6053ec188 100644
--- a/test/validation/init/init_main_ok.c
+++ b/test/common_plat/validation/api/init/init_main_ok.c
diff --git a/test/validation/lock/.gitignore b/test/common_plat/validation/api/lock/.gitignore
index ff16646f4..ff16646f4 100644
--- a/test/validation/lock/.gitignore
+++ b/test/common_plat/validation/api/lock/.gitignore
diff --git a/test/validation/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am
index 29993df44..29993df44 100644
--- a/test/validation/lock/Makefile.am
+++ b/test/common_plat/validation/api/lock/Makefile.am
diff --git a/test/validation/lock/lock.c b/test/common_plat/validation/api/lock/lock.c
index a668a3157..a668a3157 100644
--- a/test/validation/lock/lock.c
+++ b/test/common_plat/validation/api/lock/lock.c
diff --git a/test/validation/lock/lock.h b/test/common_plat/validation/api/lock/lock.h
index 5adc63352..5adc63352 100644
--- a/test/validation/lock/lock.h
+++ b/test/common_plat/validation/api/lock/lock.h
diff --git a/test/validation/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c
index 5a30f02b4..5a30f02b4 100644
--- a/test/validation/lock/lock_main.c
+++ b/test/common_plat/validation/api/lock/lock_main.c
diff --git a/test/validation/packet/.gitignore b/test/common_plat/validation/api/packet/.gitignore
index c05530d2d..c05530d2d 100644
--- a/test/validation/packet/.gitignore
+++ b/test/common_plat/validation/api/packet/.gitignore
diff --git a/test/validation/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am
index d8ebc1a23..d8ebc1a23 100644
--- a/test/validation/packet/Makefile.am
+++ b/test/common_plat/validation/api/packet/Makefile.am
diff --git a/test/validation/packet/packet.c b/test/common_plat/validation/api/packet/packet.c
index a4426e22f..a4426e22f 100644
--- a/test/validation/packet/packet.c
+++ b/test/common_plat/validation/api/packet/packet.c
diff --git a/test/validation/packet/packet.h b/test/common_plat/validation/api/packet/packet.h
index 10a377cf0..10a377cf0 100644
--- a/test/validation/packet/packet.h
+++ b/test/common_plat/validation/api/packet/packet.h
diff --git a/test/validation/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c
index 511bb104b..511bb104b 100644
--- a/test/validation/packet/packet_main.c
+++ b/test/common_plat/validation/api/packet/packet_main.c
diff --git a/test/validation/pktio/.gitignore b/test/common_plat/validation/api/pktio/.gitignore
index 1a5dd46e4..1a5dd46e4 100644
--- a/test/validation/pktio/.gitignore
+++ b/test/common_plat/validation/api/pktio/.gitignore
diff --git a/test/validation/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am
index 466d690dc..466d690dc 100644
--- a/test/validation/pktio/Makefile.am
+++ b/test/common_plat/validation/api/pktio/Makefile.am
diff --git a/test/validation/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index a6a18c352..a6a18c352 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
diff --git a/test/validation/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h
index 8131d05fe..8131d05fe 100644
--- a/test/validation/pktio/pktio.h
+++ b/test/common_plat/validation/api/pktio/pktio.h
diff --git a/test/validation/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c
index 2928e1b8a..2928e1b8a 100644
--- a/test/validation/pktio/pktio_main.c
+++ b/test/common_plat/validation/api/pktio/pktio_main.c
diff --git a/test/validation/pool/.gitignore b/test/common_plat/validation/api/pool/.gitignore
index fc91b28d6..fc91b28d6 100644
--- a/test/validation/pool/.gitignore
+++ b/test/common_plat/validation/api/pool/.gitignore
diff --git a/test/validation/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am
index 1eb8d714b..1eb8d714b 100644
--- a/test/validation/pool/Makefile.am
+++ b/test/common_plat/validation/api/pool/Makefile.am
diff --git a/test/validation/pool/pool.c b/test/common_plat/validation/api/pool/pool.c
index d48ac2a34..d48ac2a34 100644
--- a/test/validation/pool/pool.c
+++ b/test/common_plat/validation/api/pool/pool.c
diff --git a/test/validation/pool/pool.h b/test/common_plat/validation/api/pool/pool.h
index 29e517633..29e517633 100644
--- a/test/validation/pool/pool.h
+++ b/test/common_plat/validation/api/pool/pool.h
diff --git a/test/validation/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c
index bf06585b5..bf06585b5 100644
--- a/test/validation/pool/pool_main.c
+++ b/test/common_plat/validation/api/pool/pool_main.c
diff --git a/test/validation/queue/.gitignore b/test/common_plat/validation/api/queue/.gitignore
index 469506a13..469506a13 100644
--- a/test/validation/queue/.gitignore
+++ b/test/common_plat/validation/api/queue/.gitignore
diff --git a/test/validation/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am
index a477e3c56..a477e3c56 100644
--- a/test/validation/queue/Makefile.am
+++ b/test/common_plat/validation/api/queue/Makefile.am
diff --git a/test/validation/queue/queue.c b/test/common_plat/validation/api/queue/queue.c
index dc3a977cb..dc3a977cb 100644
--- a/test/validation/queue/queue.c
+++ b/test/common_plat/validation/api/queue/queue.c
diff --git a/test/validation/queue/queue.h b/test/common_plat/validation/api/queue/queue.h
index 6b787b1d6..6b787b1d6 100644
--- a/test/validation/queue/queue.h
+++ b/test/common_plat/validation/api/queue/queue.h
diff --git a/test/validation/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c
index b461b860a..b461b860a 100644
--- a/test/validation/queue/queue_main.c
+++ b/test/common_plat/validation/api/queue/queue_main.c
diff --git a/test/validation/random/.gitignore b/test/common_plat/validation/api/random/.gitignore
index 2c88ec0b8..2c88ec0b8 100644
--- a/test/validation/random/.gitignore
+++ b/test/common_plat/validation/api/random/.gitignore
diff --git a/test/validation/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am
index 69259a4db..69259a4db 100644
--- a/test/validation/random/Makefile.am
+++ b/test/common_plat/validation/api/random/Makefile.am
diff --git a/test/validation/random/random.c b/test/common_plat/validation/api/random/random.c
index 7572366c2..7572366c2 100644
--- a/test/validation/random/random.c
+++ b/test/common_plat/validation/api/random/random.c
diff --git a/test/validation/random/random.h b/test/common_plat/validation/api/random/random.h
index 26202cc37..26202cc37 100644
--- a/test/validation/random/random.h
+++ b/test/common_plat/validation/api/random/random.h
diff --git a/test/validation/random/random_main.c b/test/common_plat/validation/api/random/random_main.c
index 8f38a84c6..8f38a84c6 100644
--- a/test/validation/random/random_main.c
+++ b/test/common_plat/validation/api/random/random_main.c
diff --git a/test/validation/scheduler/.gitignore b/test/common_plat/validation/api/scheduler/.gitignore
index b4eb30091..b4eb30091 100644
--- a/test/validation/scheduler/.gitignore
+++ b/test/common_plat/validation/api/scheduler/.gitignore
diff --git a/test/validation/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am
index 2555cab81..2555cab81 100644
--- a/test/validation/scheduler/Makefile.am
+++ b/test/common_plat/validation/api/scheduler/Makefile.am
diff --git a/test/validation/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c
index 919cfb6ce..919cfb6ce 100644
--- a/test/validation/scheduler/scheduler.c
+++ b/test/common_plat/validation/api/scheduler/scheduler.c
diff --git a/test/validation/scheduler/scheduler.h b/test/common_plat/validation/api/scheduler/scheduler.h
index a619d89b2..a619d89b2 100644
--- a/test/validation/scheduler/scheduler.h
+++ b/test/common_plat/validation/api/scheduler/scheduler.h
diff --git a/test/validation/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c
index 57cfa5fc5..57cfa5fc5 100644
--- a/test/validation/scheduler/scheduler_main.c
+++ b/test/common_plat/validation/api/scheduler/scheduler_main.c
diff --git a/test/validation/shmem/.gitignore b/test/common_plat/validation/api/shmem/.gitignore
index 4d82fd53a..4d82fd53a 100644
--- a/test/validation/shmem/.gitignore
+++ b/test/common_plat/validation/api/shmem/.gitignore
diff --git a/test/validation/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am
index da88af662..da88af662 100644
--- a/test/validation/shmem/Makefile.am
+++ b/test/common_plat/validation/api/shmem/Makefile.am
diff --git a/test/validation/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c
index cbff6738c..cbff6738c 100644
--- a/test/validation/shmem/shmem.c
+++ b/test/common_plat/validation/api/shmem/shmem.c
diff --git a/test/validation/shmem/shmem.h b/test/common_plat/validation/api/shmem/shmem.h
index a5893d931..a5893d931 100644
--- a/test/validation/shmem/shmem.h
+++ b/test/common_plat/validation/api/shmem/shmem.h
diff --git a/test/validation/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c
index 4c6913051..4c6913051 100644
--- a/test/validation/shmem/shmem_main.c
+++ b/test/common_plat/validation/api/shmem/shmem_main.c
diff --git a/test/validation/std_clib/.gitignore b/test/common_plat/validation/api/std_clib/.gitignore
index 37828330a..37828330a 100644
--- a/test/validation/std_clib/.gitignore
+++ b/test/common_plat/validation/api/std_clib/.gitignore
diff --git a/test/validation/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am
index e2fc0ccf3..e2fc0ccf3 100644
--- a/test/validation/std_clib/Makefile.am
+++ b/test/common_plat/validation/api/std_clib/Makefile.am
diff --git a/test/validation/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c
index 7f089eabb..7f089eabb 100644
--- a/test/validation/std_clib/std_clib.c
+++ b/test/common_plat/validation/api/std_clib/std_clib.c
diff --git a/test/validation/std_clib/std_clib.h b/test/common_plat/validation/api/std_clib/std_clib.h
index 2804f27e2..2804f27e2 100644
--- a/test/validation/std_clib/std_clib.h
+++ b/test/common_plat/validation/api/std_clib/std_clib.h
diff --git a/test/validation/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c
index ef6f2736f..ef6f2736f 100644
--- a/test/validation/std_clib/std_clib_main.c
+++ b/test/common_plat/validation/api/std_clib/std_clib_main.c
diff --git a/test/validation/system/.gitignore b/test/common_plat/validation/api/system/.gitignore
index 347b1ee21..347b1ee21 100644
--- a/test/validation/system/.gitignore
+++ b/test/common_plat/validation/api/system/.gitignore
diff --git a/test/validation/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am
index 3789c36c2..3789c36c2 100644
--- a/test/validation/system/Makefile.am
+++ b/test/common_plat/validation/api/system/Makefile.am
diff --git a/test/validation/system/system.c b/test/common_plat/validation/api/system/system.c
index 57ff34eb9..57ff34eb9 100644
--- a/test/validation/system/system.c
+++ b/test/common_plat/validation/api/system/system.c
diff --git a/test/validation/system/system.h b/test/common_plat/validation/api/system/system.h
index cbb994eb0..cbb994eb0 100644
--- a/test/validation/system/system.h
+++ b/test/common_plat/validation/api/system/system.h
diff --git a/test/validation/system/system_main.c b/test/common_plat/validation/api/system/system_main.c
index 50d202a84..50d202a84 100644
--- a/test/validation/system/system_main.c
+++ b/test/common_plat/validation/api/system/system_main.c
diff --git a/test/validation/thread/.gitignore b/test/common_plat/validation/api/thread/.gitignore
index ab1787d97..ab1787d97 100644
--- a/test/validation/thread/.gitignore
+++ b/test/common_plat/validation/api/thread/.gitignore
diff --git a/test/validation/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am
index eaf680cf5..eaf680cf5 100644
--- a/test/validation/thread/Makefile.am
+++ b/test/common_plat/validation/api/thread/Makefile.am
diff --git a/test/validation/thread/thread.c b/test/common_plat/validation/api/thread/thread.c
index 24f1c4580..24f1c4580 100644
--- a/test/validation/thread/thread.c
+++ b/test/common_plat/validation/api/thread/thread.c
diff --git a/test/validation/thread/thread.h b/test/common_plat/validation/api/thread/thread.h
index d511c9259..d511c9259 100644
--- a/test/validation/thread/thread.h
+++ b/test/common_plat/validation/api/thread/thread.h
diff --git a/test/validation/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c
index 53c756551..53c756551 100644
--- a/test/validation/thread/thread_main.c
+++ b/test/common_plat/validation/api/thread/thread_main.c
diff --git a/test/validation/time/.gitignore b/test/common_plat/validation/api/time/.gitignore
index 0ef3e6162..0ef3e6162 100644
--- a/test/validation/time/.gitignore
+++ b/test/common_plat/validation/api/time/.gitignore
diff --git a/test/validation/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am
index bf2d0268c..bf2d0268c 100644
--- a/test/validation/time/Makefile.am
+++ b/test/common_plat/validation/api/time/Makefile.am
diff --git a/test/validation/time/time.c b/test/common_plat/validation/api/time/time.c
index 530d5c07a..530d5c07a 100644
--- a/test/validation/time/time.c
+++ b/test/common_plat/validation/api/time/time.c
diff --git a/test/validation/time/time.h b/test/common_plat/validation/api/time/time.h
index e5132a494..e5132a494 100644
--- a/test/validation/time/time.h
+++ b/test/common_plat/validation/api/time/time.h
diff --git a/test/validation/time/time_main.c b/test/common_plat/validation/api/time/time_main.c
index f86d638a5..f86d638a5 100644
--- a/test/validation/time/time_main.c
+++ b/test/common_plat/validation/api/time/time_main.c
diff --git a/test/validation/timer/.gitignore b/test/common_plat/validation/api/timer/.gitignore
index 74e8fa992..74e8fa992 100644
--- a/test/validation/timer/.gitignore
+++ b/test/common_plat/validation/api/timer/.gitignore
diff --git a/test/validation/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am
index fe6872f41..fe6872f41 100644
--- a/test/validation/timer/Makefile.am
+++ b/test/common_plat/validation/api/timer/Makefile.am
diff --git a/test/validation/timer/timer.c b/test/common_plat/validation/api/timer/timer.c
index 0007639cc..0007639cc 100644
--- a/test/validation/timer/timer.c
+++ b/test/common_plat/validation/api/timer/timer.c
diff --git a/test/validation/timer/timer.h b/test/common_plat/validation/api/timer/timer.h
index bd304fffd..bd304fffd 100644
--- a/test/validation/timer/timer.h
+++ b/test/common_plat/validation/api/timer/timer.h
diff --git a/test/validation/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c
index c318763fa..c318763fa 100644
--- a/test/validation/timer/timer_main.c
+++ b/test/common_plat/validation/api/timer/timer_main.c
diff --git a/test/validation/traffic_mngr/.gitignore b/test/common_plat/validation/api/traffic_mngr/.gitignore
index efd07a27d..efd07a27d 100644
--- a/test/validation/traffic_mngr/.gitignore
+++ b/test/common_plat/validation/api/traffic_mngr/.gitignore
diff --git a/test/validation/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am
index 35e689a02..35e689a02 100644
--- a/test/validation/traffic_mngr/Makefile.am
+++ b/test/common_plat/validation/api/traffic_mngr/Makefile.am
diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
index 1c4e90bf3..1c4e90bf3 100644
--- a/test/validation/traffic_mngr/traffic_mngr.c
+++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
diff --git a/test/validation/traffic_mngr/traffic_mngr.h b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h
index af115fef7..af115fef7 100644
--- a/test/validation/traffic_mngr/traffic_mngr.h
+++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h
diff --git a/test/validation/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
index 1fc1f78d7..1fc1f78d7 100644
--- a/test/validation/traffic_mngr/traffic_mngr_main.c
+++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index 5a7480942..460e8449f 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/common_plat/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 2d58c573b..83da1402c 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/common_plat/validation
 
 ODP_MODULES = pktio \
 	      ring \
 	      shmem
 
+ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/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 80b66ae99..b26324f83 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/common_plat/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/common_plat/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 1dc1f4491..0905b8b28 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 fd552c65c..4d16b29c4 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 b651ea346..6fd271b29 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 51716fb4d..721141a9d 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 1150158a7..96f6d5a9f 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})