diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 191484b0908542bb6afe6e7e2ab9bd35794ffd19..84deb9e5801f52b09436eb1ed5d302aaa62ba669 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,6 @@ stages:
       - export CCACHE_BASEDIR=$CI_PROJECT_DIR
       - mkdir $CI_PROJECT_DIR/build
       - cd $CI_PROJECT_DIR/build
-      - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
       - cmake ..
         -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG
         -DWALBERLA_BUILD_TESTS=ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1a0bb29f90e4c9e8c14161fa190aaaa7bcc260c..e767f4498f5a1d5c06bb399423f76e76dc6ff462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1034,12 +1034,14 @@ if ( WALBERLA_BUILD_WITH_OPENMP )
         endif()
     endif()
 
-    # check for bug in combination with OpenMP and sign conversion https://bugs.llvm.org/show_bug.cgi?id=48387
-    try_compile( WALBERLA_CLANG_OPENMP_BUG "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/TestClangOpenMPBug.cpp"
-          COMPILE_DEFINITIONS -Werror)
-    if ( NOT ${WALBERLA_CLANG_OPENMP_BUG} )
-       message(WARNING "Setting -Wno-sign-conversion due to a compiler bug in LLVM (https://bugs.llvm.org/show_bug.cgi?id=48387)" )
-       add_flag ( CMAKE_CXX_FLAGS "-Wno-sign-conversion" )
+    if( CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES IntelLLVM )
+       # check for bug in combination with OpenMP and sign conversion https://bugs.llvm.org/show_bug.cgi?id=48387
+       try_compile( WALBERLA_CLANG_OPENMP_BUG "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/TestClangOpenMPBug.cpp"
+             COMPILE_DEFINITIONS -Werror )
+       if( NOT ${WALBERLA_CLANG_OPENMP_BUG} )
+          message( WARNING "Setting -Wno-sign-conversion due to a compiler bug in LLVM (https://bugs.llvm.org/show_bug.cgi?id=48387)" )
+          add_flag( CMAKE_CXX_FLAGS "-Wno-sign-conversion" )
+       endif()
     endif()
 
 else()