diff --git a/include/ginkgo/core/base/math.hpp b/include/ginkgo/core/base/math.hpp
index 3a6152c55d4..70e4db5bb2d 100644
--- a/include/ginkgo/core/base/math.hpp
+++ b/include/ginkgo/core/base/math.hpp
@@ -47,13 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ginkgo/core/base/utils.hpp>
 
 
-// Using SYCL_LANGUAGE_VERSION will lead the mismatch sycl namespace from 6.0.0
-// when using dpcpp compiler without dpcpp module
-#if GINKGO_DPCPP_MAJOR_VERSION
-#include <CL/sycl.hpp>
-#endif
-
-
 namespace gko {
 
 
diff --git a/test/matrix/fft_kernels.cpp b/test/matrix/fft_kernels.cpp
index 59d2d2de68e..fd9dda821c0 100644
--- a/test/matrix/fft_kernels.cpp
+++ b/test/matrix/fft_kernels.cpp
@@ -138,6 +138,9 @@ TYPED_TEST(Fft, Apply1DIsEqualToReference)
 
 TYPED_TEST(Fft, ApplyStrided1DIsEqualToReference)
 {
+#if defined(GKO_COMPILING_HIP) && GINKGO_HIP_PLATFORM_HCC
+    GTEST_SKIP() << "rocFFT has a bug related to strided 1D FFT";
+#endif
     using T = typename TestFixture::value_type;
 
     this->fft->apply(this->data_strided, this->out_strided);
@@ -160,6 +163,9 @@ TYPED_TEST(Fft, Apply1DInverseIsEqualToReference)
 
 TYPED_TEST(Fft, ApplyStrided1DInverseIsEqualToReference)
 {
+#if defined(GKO_COMPILING_HIP) && GINKGO_HIP_PLATFORM_HCC
+    GTEST_SKIP() << "rocFFT has a bug related to strided 1D FFT";
+#endif
     using T = typename TestFixture::value_type;
 
     this->ifft->apply(this->data_strided, this->out_strided);
diff --git a/test/mpi/CMakeLists.txt b/test/mpi/CMakeLists.txt
index f715ea482ec..3d5e3cadd58 100644
--- a/test/mpi/CMakeLists.txt
+++ b/test/mpi/CMakeLists.txt
@@ -1,2 +1,5 @@
-add_subdirectory(distributed)
+ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
+ginkgo_create_common_and_reference_test(vector MPI_SIZE 3)
+
+add_subdirectory(preconditioner)
 add_subdirectory(solver)
diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt
deleted file mode 100644
index a92e0ef4f70..00000000000
--- a/test/mpi/distributed/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3)
-ginkgo_create_common_and_reference_test(vector MPI_SIZE 3)
-
-add_subdirectory(preconditioner)
diff --git a/test/mpi/distributed/preconditioner/CMakeLists.txt b/test/mpi/distributed/preconditioner/CMakeLists.txt
deleted file mode 100644
index 681bbec3bc9..00000000000
--- a/test/mpi/distributed/preconditioner/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ginkgo_create_common_and_reference_test(schwarz MPI_SIZE 3)
diff --git a/test/mpi/distributed/matrix.cpp b/test/mpi/matrix.cpp
similarity index 100%
rename from test/mpi/distributed/matrix.cpp
rename to test/mpi/matrix.cpp
diff --git a/test/mpi/preconditioner/CMakeLists.txt b/test/mpi/preconditioner/CMakeLists.txt
new file mode 100644
index 00000000000..4f734d21df8
--- /dev/null
+++ b/test/mpi/preconditioner/CMakeLists.txt
@@ -0,0 +1 @@
+ginkgo_create_common_and_reference_test(schwarz MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
diff --git a/test/mpi/distributed/preconditioner/schwarz.cpp b/test/mpi/preconditioner/schwarz.cpp
similarity index 100%
rename from test/mpi/distributed/preconditioner/schwarz.cpp
rename to test/mpi/preconditioner/schwarz.cpp
diff --git a/test/mpi/solver/CMakeLists.txt b/test/mpi/solver/CMakeLists.txt
index 43a2d870d3f..bffd7b5ab10 100644
--- a/test/mpi/solver/CMakeLists.txt
+++ b/test/mpi/solver/CMakeLists.txt
@@ -1 +1 @@
-ginkgo_create_common_and_reference_test(solver MPI_SIZE 3)
+ginkgo_create_common_and_reference_test(solver MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
diff --git a/test/mpi/distributed/vector.cpp b/test/mpi/vector.cpp
similarity index 100%
rename from test/mpi/distributed/vector.cpp
rename to test/mpi/vector.cpp
diff --git a/test/solver/idr_kernels.cpp b/test/solver/idr_kernels.cpp
index f7191483615..959c857cb71 100644
--- a/test/solver/idr_kernels.cpp
+++ b/test/solver/idr_kernels.cpp
@@ -40,6 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 
 
+#ifdef GKO_COMPILING_DPCPP
+#include <CL/sycl.hpp>
+#endif
+
+
 #include <ginkgo/core/base/array.hpp>
 #include <ginkgo/core/base/exception.hpp>
 #include <ginkgo/core/base/executor.hpp>