diff --git a/clients/benchmarks/CMakeLists.txt b/clients/benchmarks/CMakeLists.txt
index 7d1cddbca..801775bef 100644
--- a/clients/benchmarks/CMakeLists.txt
+++ b/clients/benchmarks/CMakeLists.txt
@@ -67,9 +67,14 @@ set( BLIS_LIBRARY ${CMAKE_SOURCE_DIR}/build/deps/blis/lib/libblis.so )
 
 
 if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
-  if( OS_ID_rhel OR OS_ID_centos)
-    set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
-    set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
+    if( OS_ID_rhel OR OS_ID_centos)
+        set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
+        set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
+    else()
+    #SLES
+        set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
+        set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
+    endif()
 
     if(EXISTS /opt/rocm/hcc/lib/clang/10.0.0/include/immintrin.h)
         set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/10.0.0/include )
@@ -78,12 +83,6 @@ if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
     else()
         error("cannot find immintrin.h")
     endif()
-  else()
-    #SLES
-    set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
-    set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
-    set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/9.0.0/include )
-  endif()
 
     # External header includes included as system files
     target_include_directories( rocblas-bench
diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt
index 3754d52a4..d1ba7b2d0 100644
--- a/clients/gtest/CMakeLists.txt
+++ b/clients/gtest/CMakeLists.txt
@@ -102,9 +102,14 @@ set( BLIS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/build/deps/blis/include/blis )
 set( BLIS_LIBRARY ${CMAKE_SOURCE_DIR}/build/deps/blis/lib/libblis.so )
 
 if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
-  if( OS_ID_rhel OR OS_ID_centos)
-    set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
-    set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
+    if( OS_ID_rhel OR OS_ID_centos)
+        set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
+        set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
+    else()
+    #SLES
+        set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
+        set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
+    endif()
 
     if(EXISTS /opt/rocm/hcc/lib/clang/10.0.0/include/immintrin.h)
         set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/10.0.0/include )
@@ -113,12 +118,6 @@ if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
     else()
         error("cannot find immintrin.h")
     endif()
-  else()
-    #SLES
-    set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
-    set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
-    set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/9.0.0/include )
-  endif()
 
     # External header includes included as system files
     target_include_directories( rocblas-test