2 files changed, 16 insertions, 4 deletions
diff --git a/src/backends/aclCommon/common.mk b/src/backends/aclCommon/common.mk
index 9854f6fcb5..67ba01b1e4 100644
--- a/src/backends/aclCommon/common.mk
+++ b/src/backends/aclCommon/common.mk
@@ -14,4 +14,11 @@ COMMON_SOURCES := \
     memory/BlobMemoryPool.cpp \
     memory/OffsetLifetimeManager.cpp \
     memory/OffsetMemoryPool.cpp \
-    memory/PoolManager.cpp
-\ No newline at end of file
+    memory/PoolManager.cpp
+
+# COMMON_TEST_SOURCES contains the list of files to be included
+# in the Android unit test build (armnn-tests) and it is picked
+# up by the Android.mk file in the root of ArmNN
+
+COMMON_TEST_SOURCES := \
+    test/MemCopyTests.cpp
diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp
index 7e503b1cdb..d8b407d1bc 100644
--- a/src/backends/aclCommon/test/MemCopyTests.cpp
+++ b/src/backends/aclCommon/test/MemCopyTests.cpp
@@ -9,11 +9,12 @@
 
 #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED
 #include <backends/aclCommon/test/MemCopyTestImpl.hpp>
+#include <backends/cl/test/ClContextControlFixture.hpp>
 #endif
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_AUTO_TEST_SUITE(MemCopyTestSuite)
+BOOST_AUTO_TEST_SUITE(MemCopyCommon)
 
 BOOST_AUTO_TEST_CASE(AclTypeConversions)
 {
@@ -34,8 +35,12 @@ BOOST_AUTO_TEST_CASE(AclTypeConversions)
     BOOST_TEST(convertedshape[3] == 5);
 }
 
+BOOST_AUTO_TEST_SUITE_END()
+
 #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED
 
+BOOST_FIXTURE_TEST_SUITE(MemCopyClNeon, ClContextControlFixture)
+
 BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndGpu)
 {
     LayerTestResult<float, 4> result = MemCopyTest<armnn::NeonWorkloadFactory, armnn::ClWorkloadFactory>(false);
@@ -60,6 +65,6 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeonWithSubtensors)
     BOOST_TEST(CompareTensors(result.output, result.outputExpected));
 }
 
-#endif
-
 BOOST_AUTO_TEST_SUITE_END()
+
+#endif
+\ No newline at end of file