diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index c65a26fd7..1f4910ad2 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/test/Makefile.inc
-TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation
+TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
 
 SUBDIRS = performance
 
diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
index a57df6c0b..598e5b837 100755
--- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
+++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
@@ -9,7 +9,7 @@
 # launched by 'make check'
 
 TEST_DIR="${TEST_DIR:-$(dirname $0)}"
-PERFORMANCE="$TEST_DIR/../../../../test/common_plat/performance"
+PERFORMANCE="$TEST_DIR/../../../../test/performance"
 ret=0
 ALL=0
 
diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh
index 075929e8c..5b861bbbf 100755
--- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh
@@ -23,7 +23,7 @@
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh
index f99d83635..c7c11f157 100755
--- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh
@@ -23,7 +23,7 @@
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh
index bf4123767..610be3bdc 100755
--- a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh
@@ -17,7 +17,7 @@
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh
index 4b5a0b3f1..bf9fc4560 100755
--- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh
@@ -17,7 +17,7 @@
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh
index e5b72335d..ecfe5a126 100755
--- a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh
@@ -18,7 +18,7 @@
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/pktio:$PATH
 PATH=$(dirname $0):$PATH
-PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/Makefile.am b/test/Makefile.am
index 67ae76aed..80c35f870 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common_plat
+SUBDIRS = performance miscellaneous validation
diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am
deleted file mode 100644
index 80c35f870..000000000
--- a/test/common_plat/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = performance miscellaneous validation
diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4
deleted file mode 100644
index e04737e18..000000000
--- a/test/common_plat/m4/configure.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-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/Makefile
-		 test/common_plat/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/configure.m4 b/test/m4/configure.m4
index 460e8449f..07ae1cf15 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -1,3 +1,33 @@
-m4_include([test/common_plat/m4/configure.m4])
+m4_include([test/m4/miscellaneous.m4])
+m4_include([test/m4/performance.m4])
+m4_include([test/m4/validation.m4])
 
-AC_CONFIG_FILES([test/Makefile])
+AC_CONFIG_FILES([test_common/Makefile
+		 test/Makefile
+		 test/miscellaneous/Makefile
+		 test/performance/Makefile
+		 test/validation/Makefile
+		 test/validation/api/atomic/Makefile
+		 test/validation/api/barrier/Makefile
+		 test/validation/api/buffer/Makefile
+		 test/validation/api/classification/Makefile
+		 test/validation/api/cpumask/Makefile
+		 test/validation/api/crypto/Makefile
+		 test/validation/api/errno/Makefile
+		 test/validation/api/hash/Makefile
+		 test/validation/api/init/Makefile
+		 test/validation/api/lock/Makefile
+		 test/validation/api/Makefile
+		 test/validation/api/packet/Makefile
+		 test/validation/api/pktio/Makefile
+		 test/validation/api/pool/Makefile
+		 test/validation/api/queue/Makefile
+		 test/validation/api/random/Makefile
+		 test/validation/api/scheduler/Makefile
+		 test/validation/api/shmem/Makefile
+		 test/validation/api/std_clib/Makefile
+		 test/validation/api/system/Makefile
+		 test/validation/api/thread/Makefile
+		 test/validation/api/time/Makefile
+		 test/validation/api/timer/Makefile
+		 test/validation/api/traffic_mngr/Makefile])
diff --git a/test/common_plat/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4
similarity index 100%
rename from test/common_plat/m4/miscellaneous.m4
rename to test/m4/miscellaneous.m4
diff --git a/test/common_plat/m4/performance.m4 b/test/m4/performance.m4
similarity index 100%
rename from test/common_plat/m4/performance.m4
rename to test/m4/performance.m4
diff --git a/test/common_plat/m4/validation.m4 b/test/m4/validation.m4
similarity index 100%
rename from test/common_plat/m4/validation.m4
rename to test/m4/validation.m4
diff --git a/test/common_plat/miscellaneous/.gitignore b/test/miscellaneous/.gitignore
similarity index 100%
rename from test/common_plat/miscellaneous/.gitignore
rename to test/miscellaneous/.gitignore
diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am
similarity index 100%
rename from test/common_plat/miscellaneous/Makefile.am
rename to test/miscellaneous/Makefile.am
diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp
similarity index 100%
rename from test/common_plat/miscellaneous/odp_api_from_cpp.cpp
rename to test/miscellaneous/odp_api_from_cpp.cpp
diff --git a/test/common_plat/performance/.gitignore b/test/performance/.gitignore
similarity index 100%
rename from test/common_plat/performance/.gitignore
rename to test/performance/.gitignore
diff --git a/test/common_plat/performance/Makefile.am b/test/performance/Makefile.am
similarity index 100%
rename from test/common_plat/performance/Makefile.am
rename to test/performance/Makefile.am
diff --git a/test/common_plat/performance/dummy_crc.h b/test/performance/dummy_crc.h
similarity index 100%
rename from test/common_plat/performance/dummy_crc.h
rename to test/performance/dummy_crc.h
diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c
similarity index 100%
rename from test/common_plat/performance/odp_bench_packet.c
rename to test/performance/odp_bench_packet.c
diff --git a/test/common_plat/performance/odp_crypto.c b/test/performance/odp_crypto.c
similarity index 100%
rename from test/common_plat/performance/odp_crypto.c
rename to test/performance/odp_crypto.c
diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
similarity index 100%
rename from test/common_plat/performance/odp_l2fwd.c
rename to test/performance/odp_l2fwd.c
diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh
similarity index 95%
rename from test/common_plat/performance/odp_l2fwd_run.sh
rename to test/performance/odp_l2fwd_run.sh
index b3148f81f..d14b86164 100755
--- a/test/common_plat/performance/odp_l2fwd_run.sh
+++ b/test/performance/odp_l2fwd_run.sh
@@ -25,12 +25,12 @@ 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
 
-PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/validation
+PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation
 
 FLOOD_MODE=0
 
diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
similarity index 100%
rename from test/common_plat/performance/odp_pktio_ordered.c
rename to test/performance/odp_pktio_ordered.c
diff --git a/test/common_plat/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh
similarity index 100%
rename from test/common_plat/performance/odp_pktio_ordered_run.sh
rename to test/performance/odp_pktio_ordered_run.sh
diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
similarity index 100%
rename from test/common_plat/performance/odp_pktio_perf.c
rename to test/performance/odp_pktio_perf.c
diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
similarity index 100%
rename from test/common_plat/performance/odp_sched_latency.c
rename to test/performance/odp_sched_latency.c
diff --git a/test/common_plat/performance/odp_sched_latency_run.sh b/test/performance/odp_sched_latency_run.sh
similarity index 100%
rename from test/common_plat/performance/odp_sched_latency_run.sh
rename to test/performance/odp_sched_latency_run.sh
diff --git a/test/common_plat/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
similarity index 100%
rename from test/common_plat/performance/odp_scheduling.c
rename to test/performance/odp_scheduling.c
diff --git a/test/common_plat/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh
similarity index 100%
rename from test/common_plat/performance/odp_scheduling_run.sh
rename to test/performance/odp_scheduling_run.sh
diff --git a/test/common_plat/performance/udp64.pcap b/test/performance/udp64.pcap
similarity index 100%
rename from test/common_plat/performance/udp64.pcap
rename to test/performance/udp64.pcap
diff --git a/test/common_plat/validation/Makefile.am b/test/validation/Makefile.am
similarity index 100%
rename from test/common_plat/validation/Makefile.am
rename to test/validation/Makefile.am
diff --git a/test/common_plat/validation/api/.gitignore b/test/validation/api/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/.gitignore
rename to test/validation/api/.gitignore
diff --git a/test/common_plat/validation/api/Makefile.am b/test/validation/api/Makefile.am
similarity index 95%
rename from test/common_plat/validation/api/Makefile.am
rename to test/validation/api/Makefile.am
index e891c94cb..730a336d5 100644
--- a/test/common_plat/validation/api/Makefile.am
+++ b/test/validation/api/Makefile.am
@@ -25,7 +25,7 @@ ODP_MODULES = atomic \
 SUBDIRS = $(ODP_MODULES)
 
 include $(top_srcdir)/test/Makefile.inc
-TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation
+TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
 
 TESTS = \
 	atomic/atomic_main$(EXEEXT) \
diff --git a/test/common_plat/validation/api/Makefile.inc b/test/validation/api/Makefile.inc
similarity index 100%
rename from test/common_plat/validation/api/Makefile.inc
rename to test/validation/api/Makefile.inc
diff --git a/test/common_plat/validation/api/README b/test/validation/api/README
similarity index 100%
rename from test/common_plat/validation/api/README
rename to test/validation/api/README
diff --git a/test/common_plat/validation/api/atomic/.gitignore b/test/validation/api/atomic/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/atomic/.gitignore
rename to test/validation/api/atomic/.gitignore
diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/atomic/Makefile.am
rename to test/validation/api/atomic/Makefile.am
diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
similarity index 100%
rename from test/common_plat/validation/api/atomic/atomic.c
rename to test/validation/api/atomic/atomic.c
diff --git a/test/common_plat/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h
similarity index 100%
rename from test/common_plat/validation/api/atomic/atomic.h
rename to test/validation/api/atomic/atomic.h
diff --git a/test/common_plat/validation/api/atomic/atomic_main.c b/test/validation/api/atomic/atomic_main.c
similarity index 100%
rename from test/common_plat/validation/api/atomic/atomic_main.c
rename to test/validation/api/atomic/atomic_main.c
diff --git a/test/common_plat/validation/api/barrier/.gitignore b/test/validation/api/barrier/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/barrier/.gitignore
rename to test/validation/api/barrier/.gitignore
diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/barrier/Makefile.am
rename to test/validation/api/barrier/Makefile.am
diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
similarity index 100%
rename from test/common_plat/validation/api/barrier/barrier.c
rename to test/validation/api/barrier/barrier.c
diff --git a/test/common_plat/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h
similarity index 100%
rename from test/common_plat/validation/api/barrier/barrier.h
rename to test/validation/api/barrier/barrier.h
diff --git a/test/common_plat/validation/api/barrier/barrier_main.c b/test/validation/api/barrier/barrier_main.c
similarity index 100%
rename from test/common_plat/validation/api/barrier/barrier_main.c
rename to test/validation/api/barrier/barrier_main.c
diff --git a/test/common_plat/validation/api/buffer/.gitignore b/test/validation/api/buffer/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/buffer/.gitignore
rename to test/validation/api/buffer/.gitignore
diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/buffer/Makefile.am
rename to test/validation/api/buffer/Makefile.am
diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c
similarity index 100%
rename from test/common_plat/validation/api/buffer/buffer.c
rename to test/validation/api/buffer/buffer.c
diff --git a/test/common_plat/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h
similarity index 100%
rename from test/common_plat/validation/api/buffer/buffer.h
rename to test/validation/api/buffer/buffer.h
diff --git a/test/common_plat/validation/api/buffer/buffer_main.c b/test/validation/api/buffer/buffer_main.c
similarity index 100%
rename from test/common_plat/validation/api/buffer/buffer_main.c
rename to test/validation/api/buffer/buffer_main.c
diff --git a/test/common_plat/validation/api/classification/.gitignore b/test/validation/api/classification/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/classification/.gitignore
rename to test/validation/api/classification/.gitignore
diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/classification/Makefile.am
rename to test/validation/api/classification/Makefile.am
diff --git a/test/common_plat/validation/api/classification/classification.c b/test/validation/api/classification/classification.c
similarity index 100%
rename from test/common_plat/validation/api/classification/classification.c
rename to test/validation/api/classification/classification.c
diff --git a/test/common_plat/validation/api/classification/classification.h b/test/validation/api/classification/classification.h
similarity index 100%
rename from test/common_plat/validation/api/classification/classification.h
rename to test/validation/api/classification/classification.h
diff --git a/test/common_plat/validation/api/classification/classification_main.c b/test/validation/api/classification/classification_main.c
similarity index 100%
rename from test/common_plat/validation/api/classification/classification_main.c
rename to test/validation/api/classification/classification_main.c
diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c
similarity index 100%
rename from test/common_plat/validation/api/classification/odp_classification_basic.c
rename to test/validation/api/classification/odp_classification_basic.c
diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c
similarity index 100%
rename from test/common_plat/validation/api/classification/odp_classification_common.c
rename to test/validation/api/classification/odp_classification_common.c
diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c
similarity index 100%
rename from test/common_plat/validation/api/classification/odp_classification_test_pmr.c
rename to test/validation/api/classification/odp_classification_test_pmr.c
diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
similarity index 100%
rename from test/common_plat/validation/api/classification/odp_classification_tests.c
rename to test/validation/api/classification/odp_classification_tests.c
diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h
similarity index 100%
rename from test/common_plat/validation/api/classification/odp_classification_testsuites.h
rename to test/validation/api/classification/odp_classification_testsuites.h
diff --git a/test/common_plat/validation/api/cpumask/.gitignore b/test/validation/api/cpumask/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/cpumask/.gitignore
rename to test/validation/api/cpumask/.gitignore
diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/cpumask/Makefile.am
rename to test/validation/api/cpumask/Makefile.am
diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c
similarity index 100%
rename from test/common_plat/validation/api/cpumask/cpumask.c
rename to test/validation/api/cpumask/cpumask.c
diff --git a/test/common_plat/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h
similarity index 100%
rename from test/common_plat/validation/api/cpumask/cpumask.h
rename to test/validation/api/cpumask/cpumask.h
diff --git a/test/common_plat/validation/api/cpumask/cpumask_main.c b/test/validation/api/cpumask/cpumask_main.c
similarity index 100%
rename from test/common_plat/validation/api/cpumask/cpumask_main.c
rename to test/validation/api/cpumask/cpumask_main.c
diff --git a/test/common_plat/validation/api/crypto/.gitignore b/test/validation/api/crypto/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/crypto/.gitignore
rename to test/validation/api/crypto/.gitignore
diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/crypto/Makefile.am
rename to test/validation/api/crypto/Makefile.am
diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c
similarity index 100%
rename from test/common_plat/validation/api/crypto/crypto.c
rename to test/validation/api/crypto/crypto.c
diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h
similarity index 100%
rename from test/common_plat/validation/api/crypto/crypto.h
rename to test/validation/api/crypto/crypto.h
diff --git a/test/common_plat/validation/api/crypto/crypto_main.c b/test/validation/api/crypto/crypto_main.c
similarity index 100%
rename from test/common_plat/validation/api/crypto/crypto_main.c
rename to test/validation/api/crypto/crypto_main.c
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
similarity index 100%
rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
rename to test/validation/api/crypto/odp_crypto_test_inp.c
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/validation/api/crypto/odp_crypto_test_inp.h
similarity index 100%
rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.h
rename to test/validation/api/crypto/odp_crypto_test_inp.h
diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
similarity index 100%
rename from test/common_plat/validation/api/crypto/test_vectors.h
rename to test/validation/api/crypto/test_vectors.h
diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h
similarity index 100%
rename from test/common_plat/validation/api/crypto/test_vectors_len.h
rename to test/validation/api/crypto/test_vectors_len.h
diff --git a/test/common_plat/validation/api/errno/.gitignore b/test/validation/api/errno/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/errno/.gitignore
rename to test/validation/api/errno/.gitignore
diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/errno/Makefile.am
rename to test/validation/api/errno/Makefile.am
diff --git a/test/common_plat/validation/api/errno/errno.c b/test/validation/api/errno/errno.c
similarity index 100%
rename from test/common_plat/validation/api/errno/errno.c
rename to test/validation/api/errno/errno.c
diff --git a/test/common_plat/validation/api/errno/errno.h b/test/validation/api/errno/errno.h
similarity index 100%
rename from test/common_plat/validation/api/errno/errno.h
rename to test/validation/api/errno/errno.h
diff --git a/test/common_plat/validation/api/errno/errno_main.c b/test/validation/api/errno/errno_main.c
similarity index 100%
rename from test/common_plat/validation/api/errno/errno_main.c
rename to test/validation/api/errno/errno_main.c
diff --git a/test/common_plat/validation/api/hash/.gitignore b/test/validation/api/hash/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/hash/.gitignore
rename to test/validation/api/hash/.gitignore
diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/hash/Makefile.am
rename to test/validation/api/hash/Makefile.am
diff --git a/test/common_plat/validation/api/hash/hash.c b/test/validation/api/hash/hash.c
similarity index 100%
rename from test/common_plat/validation/api/hash/hash.c
rename to test/validation/api/hash/hash.c
diff --git a/test/common_plat/validation/api/hash/hash.h b/test/validation/api/hash/hash.h
similarity index 100%
rename from test/common_plat/validation/api/hash/hash.h
rename to test/validation/api/hash/hash.h
diff --git a/test/common_plat/validation/api/hash/hash_main.c b/test/validation/api/hash/hash_main.c
similarity index 100%
rename from test/common_plat/validation/api/hash/hash_main.c
rename to test/validation/api/hash/hash_main.c
diff --git a/test/common_plat/validation/api/init/.gitignore b/test/validation/api/init/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/init/.gitignore
rename to test/validation/api/init/.gitignore
diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/init/Makefile.am
rename to test/validation/api/init/Makefile.am
diff --git a/test/common_plat/validation/api/init/init.c b/test/validation/api/init/init.c
similarity index 100%
rename from test/common_plat/validation/api/init/init.c
rename to test/validation/api/init/init.c
diff --git a/test/common_plat/validation/api/init/init.h b/test/validation/api/init/init.h
similarity index 100%
rename from test/common_plat/validation/api/init/init.h
rename to test/validation/api/init/init.h
diff --git a/test/common_plat/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c
similarity index 100%
rename from test/common_plat/validation/api/init/init_main_abort.c
rename to test/validation/api/init/init_main_abort.c
diff --git a/test/common_plat/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c
similarity index 100%
rename from test/common_plat/validation/api/init/init_main_log.c
rename to test/validation/api/init/init_main_log.c
diff --git a/test/common_plat/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c
similarity index 100%
rename from test/common_plat/validation/api/init/init_main_ok.c
rename to test/validation/api/init/init_main_ok.c
diff --git a/test/common_plat/validation/api/lock/.gitignore b/test/validation/api/lock/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/lock/.gitignore
rename to test/validation/api/lock/.gitignore
diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/lock/Makefile.am
rename to test/validation/api/lock/Makefile.am
diff --git a/test/common_plat/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
similarity index 100%
rename from test/common_plat/validation/api/lock/lock.c
rename to test/validation/api/lock/lock.c
diff --git a/test/common_plat/validation/api/lock/lock.h b/test/validation/api/lock/lock.h
similarity index 100%
rename from test/common_plat/validation/api/lock/lock.h
rename to test/validation/api/lock/lock.h
diff --git a/test/common_plat/validation/api/lock/lock_main.c b/test/validation/api/lock/lock_main.c
similarity index 100%
rename from test/common_plat/validation/api/lock/lock_main.c
rename to test/validation/api/lock/lock_main.c
diff --git a/test/common_plat/validation/api/packet/.gitignore b/test/validation/api/packet/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/packet/.gitignore
rename to test/validation/api/packet/.gitignore
diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/packet/Makefile.am
rename to test/validation/api/packet/Makefile.am
diff --git a/test/common_plat/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
similarity index 100%
rename from test/common_plat/validation/api/packet/packet.c
rename to test/validation/api/packet/packet.c
diff --git a/test/common_plat/validation/api/packet/packet.h b/test/validation/api/packet/packet.h
similarity index 100%
rename from test/common_plat/validation/api/packet/packet.h
rename to test/validation/api/packet/packet.h
diff --git a/test/common_plat/validation/api/packet/packet_main.c b/test/validation/api/packet/packet_main.c
similarity index 100%
rename from test/common_plat/validation/api/packet/packet_main.c
rename to test/validation/api/packet/packet_main.c
diff --git a/test/common_plat/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/pktio/.gitignore
rename to test/validation/api/pktio/.gitignore
diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/pktio/Makefile.am
rename to test/validation/api/pktio/Makefile.am
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c
similarity index 100%
rename from test/common_plat/validation/api/pktio/parser.c
rename to test/validation/api/pktio/parser.c
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h
similarity index 100%
rename from test/common_plat/validation/api/pktio/parser.h
rename to test/validation/api/pktio/parser.h
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
similarity index 100%
rename from test/common_plat/validation/api/pktio/pktio.c
rename to test/validation/api/pktio/pktio.c
diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h
similarity index 100%
rename from test/common_plat/validation/api/pktio/pktio.h
rename to test/validation/api/pktio/pktio.h
diff --git a/test/common_plat/validation/api/pktio/pktio_main.c b/test/validation/api/pktio/pktio_main.c
similarity index 100%
rename from test/common_plat/validation/api/pktio/pktio_main.c
rename to test/validation/api/pktio/pktio_main.c
diff --git a/test/common_plat/validation/api/pool/.gitignore b/test/validation/api/pool/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/pool/.gitignore
rename to test/validation/api/pool/.gitignore
diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/pool/Makefile.am
rename to test/validation/api/pool/Makefile.am
diff --git a/test/common_plat/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
similarity index 100%
rename from test/common_plat/validation/api/pool/pool.c
rename to test/validation/api/pool/pool.c
diff --git a/test/common_plat/validation/api/pool/pool.h b/test/validation/api/pool/pool.h
similarity index 100%
rename from test/common_plat/validation/api/pool/pool.h
rename to test/validation/api/pool/pool.h
diff --git a/test/common_plat/validation/api/pool/pool_main.c b/test/validation/api/pool/pool_main.c
similarity index 100%
rename from test/common_plat/validation/api/pool/pool_main.c
rename to test/validation/api/pool/pool_main.c
diff --git a/test/common_plat/validation/api/queue/.gitignore b/test/validation/api/queue/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/queue/.gitignore
rename to test/validation/api/queue/.gitignore
diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/queue/Makefile.am
rename to test/validation/api/queue/Makefile.am
diff --git a/test/common_plat/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
similarity index 100%
rename from test/common_plat/validation/api/queue/queue.c
rename to test/validation/api/queue/queue.c
diff --git a/test/common_plat/validation/api/queue/queue.h b/test/validation/api/queue/queue.h
similarity index 100%
rename from test/common_plat/validation/api/queue/queue.h
rename to test/validation/api/queue/queue.h
diff --git a/test/common_plat/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c
similarity index 100%
rename from test/common_plat/validation/api/queue/queue_main.c
rename to test/validation/api/queue/queue_main.c
diff --git a/test/common_plat/validation/api/random/.gitignore b/test/validation/api/random/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/random/.gitignore
rename to test/validation/api/random/.gitignore
diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/random/Makefile.am
rename to test/validation/api/random/Makefile.am
diff --git a/test/common_plat/validation/api/random/random.c b/test/validation/api/random/random.c
similarity index 100%
rename from test/common_plat/validation/api/random/random.c
rename to test/validation/api/random/random.c
diff --git a/test/common_plat/validation/api/random/random.h b/test/validation/api/random/random.h
similarity index 100%
rename from test/common_plat/validation/api/random/random.h
rename to test/validation/api/random/random.h
diff --git a/test/common_plat/validation/api/random/random_main.c b/test/validation/api/random/random_main.c
similarity index 100%
rename from test/common_plat/validation/api/random/random_main.c
rename to test/validation/api/random/random_main.c
diff --git a/test/common_plat/validation/api/scheduler/.gitignore b/test/validation/api/scheduler/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/scheduler/.gitignore
rename to test/validation/api/scheduler/.gitignore
diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/scheduler/Makefile.am
rename to test/validation/api/scheduler/Makefile.am
diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
similarity index 100%
rename from test/common_plat/validation/api/scheduler/scheduler.c
rename to test/validation/api/scheduler/scheduler.c
diff --git a/test/common_plat/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h
similarity index 100%
rename from test/common_plat/validation/api/scheduler/scheduler.h
rename to test/validation/api/scheduler/scheduler.h
diff --git a/test/common_plat/validation/api/scheduler/scheduler_main.c b/test/validation/api/scheduler/scheduler_main.c
similarity index 100%
rename from test/common_plat/validation/api/scheduler/scheduler_main.c
rename to test/validation/api/scheduler/scheduler_main.c
diff --git a/test/common_plat/validation/api/shmem/.gitignore b/test/validation/api/shmem/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/shmem/.gitignore
rename to test/validation/api/shmem/.gitignore
diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/shmem/Makefile.am
rename to test/validation/api/shmem/Makefile.am
diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
similarity index 100%
rename from test/common_plat/validation/api/shmem/shmem.c
rename to test/validation/api/shmem/shmem.c
diff --git a/test/common_plat/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h
similarity index 100%
rename from test/common_plat/validation/api/shmem/shmem.h
rename to test/validation/api/shmem/shmem.h
diff --git a/test/common_plat/validation/api/shmem/shmem_main.c b/test/validation/api/shmem/shmem_main.c
similarity index 100%
rename from test/common_plat/validation/api/shmem/shmem_main.c
rename to test/validation/api/shmem/shmem_main.c
diff --git a/test/common_plat/validation/api/std_clib/.gitignore b/test/validation/api/std_clib/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/std_clib/.gitignore
rename to test/validation/api/std_clib/.gitignore
diff --git a/test/common_plat/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/std_clib/Makefile.am
rename to test/validation/api/std_clib/Makefile.am
diff --git a/test/common_plat/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c
similarity index 100%
rename from test/common_plat/validation/api/std_clib/std_clib.c
rename to test/validation/api/std_clib/std_clib.c
diff --git a/test/common_plat/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h
similarity index 100%
rename from test/common_plat/validation/api/std_clib/std_clib.h
rename to test/validation/api/std_clib/std_clib.h
diff --git a/test/common_plat/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c
similarity index 100%
rename from test/common_plat/validation/api/std_clib/std_clib_main.c
rename to test/validation/api/std_clib/std_clib_main.c
diff --git a/test/common_plat/validation/api/system/.gitignore b/test/validation/api/system/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/system/.gitignore
rename to test/validation/api/system/.gitignore
diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/system/Makefile.am
rename to test/validation/api/system/Makefile.am
diff --git a/test/common_plat/validation/api/system/system.c b/test/validation/api/system/system.c
similarity index 100%
rename from test/common_plat/validation/api/system/system.c
rename to test/validation/api/system/system.c
diff --git a/test/common_plat/validation/api/system/system.h b/test/validation/api/system/system.h
similarity index 100%
rename from test/common_plat/validation/api/system/system.h
rename to test/validation/api/system/system.h
diff --git a/test/common_plat/validation/api/system/system_main.c b/test/validation/api/system/system_main.c
similarity index 100%
rename from test/common_plat/validation/api/system/system_main.c
rename to test/validation/api/system/system_main.c
diff --git a/test/common_plat/validation/api/thread/.gitignore b/test/validation/api/thread/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/thread/.gitignore
rename to test/validation/api/thread/.gitignore
diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/thread/Makefile.am
rename to test/validation/api/thread/Makefile.am
diff --git a/test/common_plat/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
similarity index 100%
rename from test/common_plat/validation/api/thread/thread.c
rename to test/validation/api/thread/thread.c
diff --git a/test/common_plat/validation/api/thread/thread.h b/test/validation/api/thread/thread.h
similarity index 100%
rename from test/common_plat/validation/api/thread/thread.h
rename to test/validation/api/thread/thread.h
diff --git a/test/common_plat/validation/api/thread/thread_main.c b/test/validation/api/thread/thread_main.c
similarity index 100%
rename from test/common_plat/validation/api/thread/thread_main.c
rename to test/validation/api/thread/thread_main.c
diff --git a/test/common_plat/validation/api/time/.gitignore b/test/validation/api/time/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/time/.gitignore
rename to test/validation/api/time/.gitignore
diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/time/Makefile.am
rename to test/validation/api/time/Makefile.am
diff --git a/test/common_plat/validation/api/time/time.c b/test/validation/api/time/time.c
similarity index 100%
rename from test/common_plat/validation/api/time/time.c
rename to test/validation/api/time/time.c
diff --git a/test/common_plat/validation/api/time/time.sh b/test/validation/api/time/time.sh
similarity index 93%
rename from test/common_plat/validation/api/time/time.sh
rename to test/validation/api/time/time.sh
index 02bf75a76..ecedddb76 100755
--- a/test/common_plat/validation/api/time/time.sh
+++ b/test/validation/api/time/time.sh
@@ -13,7 +13,7 @@
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/time:$PATH
-PATH=$(dirname $0)/../../../../common_plat/validation/api/time:$PATH
+PATH=$(dirname $0)/../../../../validation/api/time:$PATH
 PATH=$(dirname $0):$PATH
 PATH=`pwd`:$PATH
 
diff --git a/test/common_plat/validation/api/time/time_main.c b/test/validation/api/time/time_main.c
similarity index 100%
rename from test/common_plat/validation/api/time/time_main.c
rename to test/validation/api/time/time_main.c
diff --git a/test/common_plat/validation/api/time/time_test.h b/test/validation/api/time/time_test.h
similarity index 100%
rename from test/common_plat/validation/api/time/time_test.h
rename to test/validation/api/time/time_test.h
diff --git a/test/common_plat/validation/api/timer/.gitignore b/test/validation/api/timer/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/timer/.gitignore
rename to test/validation/api/timer/.gitignore
diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/timer/Makefile.am
rename to test/validation/api/timer/Makefile.am
diff --git a/test/common_plat/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
similarity index 100%
rename from test/common_plat/validation/api/timer/timer.c
rename to test/validation/api/timer/timer.c
diff --git a/test/common_plat/validation/api/timer/timer.h b/test/validation/api/timer/timer.h
similarity index 100%
rename from test/common_plat/validation/api/timer/timer.h
rename to test/validation/api/timer/timer.h
diff --git a/test/common_plat/validation/api/timer/timer_main.c b/test/validation/api/timer/timer_main.c
similarity index 100%
rename from test/common_plat/validation/api/timer/timer_main.c
rename to test/validation/api/timer/timer_main.c
diff --git a/test/common_plat/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore
similarity index 100%
rename from test/common_plat/validation/api/traffic_mngr/.gitignore
rename to test/validation/api/traffic_mngr/.gitignore
diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am
similarity index 100%
rename from test/common_plat/validation/api/traffic_mngr/Makefile.am
rename to test/validation/api/traffic_mngr/Makefile.am
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c
similarity index 100%
rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
rename to test/validation/api/traffic_mngr/traffic_mngr.c
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h b/test/validation/api/traffic_mngr/traffic_mngr.h
similarity index 100%
rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.h
rename to test/validation/api/traffic_mngr/traffic_mngr.h
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh
similarity index 93%
rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh
rename to test/validation/api/traffic_mngr/traffic_mngr.sh
index 4db7ea384..c4e2d2976 100755
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh
+++ b/test/validation/api/traffic_mngr/traffic_mngr.sh
@@ -13,7 +13,7 @@
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
 PATH=${TEST_DIR}/api/traffic_mngr:$PATH
-PATH=$(dirname $0)/../../../../common_plat/validation/api/traffic_mngr:$PATH
+PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH
 PATH=$(dirname $0):$PATH
 PATH=`pwd`:$PATH
 
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c b/test/validation/api/traffic_mngr/traffic_mngr_main.c
similarity index 100%
rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
rename to test/validation/api/traffic_mngr/traffic_mngr_main.c
