diff --git a/armnn.changes b/armnn.changes
index 36f6ead..2cd0806 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 28 15:38:27 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add a conflict between armnn-extratests and armnn-opencl-extratests
+
 -------------------------------------------------------------------
 Mon Oct 28 13:06:56 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/armnn.spec b/armnn.spec
index b478995..b8a8961 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -226,6 +226,12 @@ This package contains the development libraries and headers for armnn.
 %package -n %{name}-extratests
 Summary:        Additionnal downstream tests for Arm NN
 Group:          Development/Libraries/C and C++
+# Make sure we do not install both openCL and non-openCL (CPU only) versions.
+%if "%{target}" == "opencl"
+Conflicts:      armnn-extratests
+%else
+Conflicts:      armnn-opencl-extratests
+%endif
 Requires:       %{name}
 
 %description -n %{name}-extratests