diff --git a/tests/validation_new/CPP/ActivationLayer.h b/tests/validation_new/CPP/ActivationLayer.h
index 5f4ef46..3f10a2f 100644
--- a/tests/validation_new/CPP/ActivationLayer.h
+++ b/tests/validation_new/CPP/ActivationLayer.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_ACTIVATION_LAYER_H__
 #define __ARM_COMPUTE_TEST_ACTIVATION_LAYER_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/BitwiseAnd.h b/tests/validation_new/CPP/BitwiseAnd.h
index 07fda90..eba2fd6 100644
--- a/tests/validation_new/CPP/BitwiseAnd.h
+++ b/tests/validation_new/CPP/BitwiseAnd.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_BITWISE_AND_H__
 #define __ARM_COMPUTE_TEST_BITWISE_AND_H__
 
-#include "tests/validation_new/SimpleTensor.h"
+#include "tests/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/BitwiseNot.h b/tests/validation_new/CPP/BitwiseNot.h
index 36aa50d..b4206f9 100644
--- a/tests/validation_new/CPP/BitwiseNot.h
+++ b/tests/validation_new/CPP/BitwiseNot.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_BITWISE_NOT_H__
 #define __ARM_COMPUTE_TEST_BITWISE_NOT_H__
 
-#include "tests/validation_new/SimpleTensor.h"
+#include "tests/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/BitwiseOr.h b/tests/validation_new/CPP/BitwiseOr.h
index 7275511..39158cb 100644
--- a/tests/validation_new/CPP/BitwiseOr.h
+++ b/tests/validation_new/CPP/BitwiseOr.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_BITWISE_OR_H__
 #define __ARM_COMPUTE_TEST_BITWISE_OR_H__
 
-#include "tests/validation_new/SimpleTensor.h"
+#include "tests/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/BitwiseXor.h b/tests/validation_new/CPP/BitwiseXor.h
index 45a2e03..3e7721e 100644
--- a/tests/validation_new/CPP/BitwiseXor.h
+++ b/tests/validation_new/CPP/BitwiseXor.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_BITWISE_XOR_H__
 #define __ARM_COMPUTE_TEST_BITWISE_XOR_H__
 
-#include "tests/validation_new/SimpleTensor.h"
+#include "tests/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/ConvolutionLayer.h b/tests/validation_new/CPP/ConvolutionLayer.h
index fd46567..a7c9e08 100644
--- a/tests/validation_new/CPP/ConvolutionLayer.h
+++ b/tests/validation_new/CPP/ConvolutionLayer.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_CONVOLUTION_LAYER_H__
 #define __ARM_COMPUTE_TEST_CONVOLUTION_LAYER_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/DepthConcatenateLayer.h b/tests/validation_new/CPP/DepthConcatenateLayer.h
index b67eb55..3c486a8 100644
--- a/tests/validation_new/CPP/DepthConcatenateLayer.h
+++ b/tests/validation_new/CPP/DepthConcatenateLayer.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DEPTHCONCATENATE_LAYER_H__
 #define __ARM_COMPUTE_TEST_DEPTHCONCATENATE_LAYER_H__
 
-#include "tests/validation_new/SimpleTensor.h"
+#include "tests/SimpleTensor.h"
 
 #include <vector>
 
diff --git a/tests/validation_new/CPP/Floor.h b/tests/validation_new/CPP/Floor.h
index 8a6c3bc..30b8118 100644
--- a/tests/validation_new/CPP/Floor.h
+++ b/tests/validation_new/CPP/Floor.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_FLOOR_H__
 #define __ARM_COMPUTE_TEST_FLOOR_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/GEMM.h b/tests/validation_new/CPP/GEMM.h
index ff79c7b..7fea2a9 100644
--- a/tests/validation_new/CPP/GEMM.h
+++ b/tests/validation_new/CPP/GEMM.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_GEMM_H__
 #define __ARM_COMPUTE_TEST_GEMM_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/L2Normalize.h b/tests/validation_new/CPP/L2Normalize.h
index 3e81b9a..da36a73 100644
--- a/tests/validation_new/CPP/L2Normalize.h
+++ b/tests/validation_new/CPP/L2Normalize.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_L2NORMALIZE_H__
 #define __ARM_COMPUTE_TEST_L2NORMALIZE_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/NormalizationLayer.h b/tests/validation_new/CPP/NormalizationLayer.h
index 54284b1..bdd8754 100644
--- a/tests/validation_new/CPP/NormalizationLayer.h
+++ b/tests/validation_new/CPP/NormalizationLayer.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_NORMALIZATION_LAYER_H__
 #define __ARM_COMPUTE_TEST_NORMALIZATION_LAYER_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/ReductionOperation.h b/tests/validation_new/CPP/ReductionOperation.h
index 43a700d..500a816 100644
--- a/tests/validation_new/CPP/ReductionOperation.h
+++ b/tests/validation_new/CPP/ReductionOperation.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_REDUCTION_OPERATION_H__
 #define __ARM_COMPUTE_TEST_REDUCTION_OPERATION_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation_new/CPP/SoftmaxLayer.h b/tests/validation_new/CPP/SoftmaxLayer.h
index 28a532e..cc52f3c 100644
--- a/tests/validation_new/CPP/SoftmaxLayer.h
+++ b/tests/validation_new/CPP/SoftmaxLayer.h
@@ -24,8 +24,8 @@
 #ifndef __ARM_COMPUTE_TEST_SOFTMAX_LAYER_H__
 #define __ARM_COMPUTE_TEST_SOFTMAX_LAYER_H__
 
+#include "tests/SimpleTensor.h"
 #include "tests/validation_new/Helpers.h"
-#include "tests/validation_new/SimpleTensor.h"
 
 namespace arm_compute
 {