diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake
index 9d36b49911e..3c0799a2539 100644
--- a/cmake/create_test.cmake
+++ b/cmake/create_test.cmake
@@ -31,6 +31,7 @@ function(ginkgo_create_test test_name)
     add_executable(${test_target_name} ${test_name}.cpp)
     target_compile_features(${test_target_name} PUBLIC cxx_std_14)
     target_compile_options(${test_target_name} PRIVATE ${GINKGO_COMPILER_FLAGS})
+    target_link_options(${test_target_name} PRIVATE -fsycl-device-code-split=per_kernel)
     target_link_libraries(${test_target_name} PRIVATE ${ARGN})
     ginkgo_set_test_target_properties(${test_name} ${test_target_name})
 endfunction(ginkgo_create_test)
diff --git a/dpcpp/components/format_conversion.dp.hpp b/dpcpp/components/format_conversion.dp.hpp
index d92661bce83..b75b663bb99 100644
--- a/dpcpp/components/format_conversion.dp.hpp
+++ b/dpcpp/components/format_conversion.dp.hpp
@@ -37,8 +37,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <CL/sycl.hpp>
 
 
-#include <ginkgo/core/base/types.hpp>
 #include <ginkgo/core/base/executor.hpp>
+#include <ginkgo/core/base/types.hpp>
 
 
 #include "dpcpp/base/dim3.dp.hpp"