diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3a080bc..ceac8655 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,17 +122,16 @@ include(CheckFunctionExists)
 include(CheckIncludeFiles)
 
 if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-narrowing")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
     # -msse -mfpmath=sse to force gcc to use sse for float math,
     # avoiding excess precision problems that cause tests like int2float
     # to falsely fail. -ffloat-store also works, but WG suggested
     # that sse would be better.
-    if(CMAKE_ARM_COMPILER OR ANDROID)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-narrowing")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
-    else(CMAKE_ARM_COMPILER OR ANDROID)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -mfpmath=sse -Wno-narrowing")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -mfpmath=sse -Wno-narrowing")
-    endif(CMAKE_ARM_COMPILER OR ANDROID)
+	if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*" OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -mfpmath=sse")
+    endif()
 else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D__SSE__")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D__SSE__")
diff --git a/test_conformance/CMakeCommon.txt b/test_conformance/CMakeCommon.txt
index 3dc40e2e..0beaedc2 100644
--- a/test_conformance/CMakeCommon.txt
+++ b/test_conformance/CMakeCommon.txt
@@ -1,5 +1,3 @@
-set_source_files_properties(COMPILE_FLAGS -msse2)
-
 string(TOLOWER ${MODULE_NAME} MODULE_NAME_LOWER)
 
 set(${MODULE_NAME}_OUT ${CONFORMANCE_PREFIX}${MODULE_NAME_LOWER}${CONFORMANCE_SUFFIX})
diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index 3423aeb5..4bd0b796 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -25,10 +25,4 @@ set_source_files_properties(
         COMPILE_FLAGS -march=i686)
 endif(NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID)
 
-if(NOT ANDROID)
-set_source_files_properties(
-        Sleep.cpp test_conversions.cpp basic_test_conversions.cpp
-        COMPILE_FLAGS -msse2)
-endif(NOT ANDROID)
-
 include(../CMakeCommon.txt)
diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt
index d0bcc575..88180394 100644
--- a/test_conformance/math_brute_force/CMakeLists.txt
+++ b/test_conformance/math_brute_force/CMakeLists.txt
@@ -21,26 +21,6 @@ set(${MODULE_NAME}_SOURCES
     unary_u.cpp
 )
 
-
-if (NOT ANDROID)
-set_source_files_properties(
-    FunctionList.cpp
-    Sleep.cpp
-    binary.cpp
-    binaryOperator.cpp
-    Utility.cpp
-    binary_i.cpp
-    binary_two_results_i.cpp
-    i_unary.cpp
-    macro_binary.cpp
-    macro_unary.cpp
-    mad.cpp
-    main.cpp     reference_math.cpp
-    ternary.cpp     unary.cpp     unary_two_results.cpp
-    unary_two_results_i.cpp unary_u.cpp
-    COMPILE_FLAGS -msse2    )
-endif(NOT ANDROID)
-
 if (NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID)
 set_source_files_properties(
 ${MODULE_NAME}_SOURCES
diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt
index a20521a5..2fdda8f0 100644
--- a/test_conformance/multiple_device_context/CMakeLists.txt
+++ b/test_conformance/multiple_device_context/CMakeLists.txt
@@ -6,8 +6,4 @@ set(${MODULE_NAME}_SOURCES
     test_multiple_devices.cpp
 )
 
-
-set_source_files_properties(
-        COMPILE_FLAGS -msse2)
-
 include(../CMakeCommon.txt)
diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt
index 5f50622e..70effa15 100644
--- a/test_conformance/spir/CMakeLists.txt
+++ b/test_conformance/spir/CMakeLists.txt
@@ -15,11 +15,6 @@ set (SPIR_SOURCES
 add_executable(${SPIR_OUT}
     ${SPIR_SOURCES})
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)" AND NOT MSVC)
-set_source_files_properties(
-        COMPILE_FLAGS -msse2)
-endif()
-
 if(UNIX)
     set_target_properties(${SPIR_OUT} PROPERTIES
        COMPILE_FLAGS "-fexceptions -frtti")
@@ -69,4 +64,3 @@ foreach(input_file ${SPIR_FILES})
     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${input_file}" "$<TARGET_FILE_DIR:${SPIR_OUT}>/"
 )
 endforeach(input_file)
-
diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt
index 07e56776..111f92ae 100644
--- a/test_conformance/thread_dimensions/CMakeLists.txt
+++ b/test_conformance/thread_dimensions/CMakeLists.txt
@@ -5,7 +5,4 @@ set(${MODULE_NAME}_SOURCES
     test_thread_dimensions.cpp
 )
 
-set_source_files_properties(
-        COMPILE_FLAGS -msse2)
-
 include(../CMakeCommon.txt)
diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt
index 3f252e7f..f1a42e66 100644
--- a/test_conformance/vec_align/CMakeLists.txt
+++ b/test_conformance/vec_align/CMakeLists.txt
@@ -8,8 +8,4 @@ set(${MODULE_NAME}_SOURCES
         type_replacer.cpp
 )
 
-set_source_files_properties(
-        COMPILE_FLAGS -msse2)
-
 include(../CMakeCommon.txt)
-
diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt
index b805c9b9..c18fc1bc 100644
--- a/test_conformance/vec_step/CMakeLists.txt
+++ b/test_conformance/vec_step/CMakeLists.txt
@@ -8,7 +8,4 @@ set(${MODULE_NAME}_SOURCES
         type_replacer.cpp
 )
 
-set_source_files_properties(
-        COMPILE_FLAGS -msse2)
-
 include(../CMakeCommon.txt)