diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24614ea5..7476d5f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,15 +469,6 @@ endif()
 
 
 
-################################################################################
-# Check for availability of SSE
-################################################################################
-if(NOT ENABLE_GENERIC_ARCH)
-    include(TestForSSE)
-endif()
-
-
-
 ################################################################################
 # Find the POSIX thread (pthread) libraries
 ################################################################################
@@ -1866,12 +1857,6 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall -Wextra")  #Add warning flags: For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(OS_IS_MACOSX)
-        set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -stdlib=libc++")
-    endif()
-endif()
-
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
 if(NOT ARCH_COMPILER_FLAGS)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 197a3b162..f3da0060f 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -58,6 +58,7 @@ if(NOT ${GTEST_DIR_LOCAL})
     if(OS_IS_MACOSX)
         if(CMAKE_GENERATOR STREQUAL Xcode)
             set(DEBUG_PREFIX "Debug/")
+            set(DEBUG_POSTFIX "d")
         endif()
     endif()
 
@@ -167,12 +168,6 @@ if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(OS_IS_MACOSX)
-        set(CLANG_FLAGS "-stdlib=libc++ -lc++")
-    endif()
-endif()
-
 if(OPENCL_FOUND)
     add_definitions(-DOPENCL_BLOCKS_TEST=1)
 endif()
@@ -350,7 +345,6 @@ if(ENABLE_UNIT_TESTING)
 
     target_link_libraries(run_tests
         PUBLIC
-            ${CLANG_FLAGS}
             Boost::chrono
             Boost::filesystem
             Boost::system