diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc
index c3a74676956f8..b05733e9d99eb 100644
--- a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc
+++ b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc
@@ -1,30 +1,19 @@
-#include <alpaka/alpaka.hpp>
-#include "HeterogeneousCore/AlpakaInterface/interface/devices.h"
-#include "HeterogeneousCore/AlpakaInterface/interface/host.h"
-#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
-#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+#include <cstdlib>
+#include <iostream>
 
-#include "DataFormats/VertexSoA/interface/ZVertexHost.h"
-#include "DataFormats/VertexSoA/interface/alpaka/ZVertexSoACollection.h"
-#include "DataFormats/VertexSoA/interface/ZVertexDevice.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/devices.h"
 
-#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h"
-#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h"
-#include "RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h"
+#include "VertexFinder_t.h"
 
-using namespace std;
 using namespace ALPAKA_ACCELERATOR_NAMESPACE;
 
-namespace ALPAKA_ACCELERATOR_NAMESPACE {
-
-  namespace vertexfinder_t {
-    void runKernels(Queue& queue);
+int main() {
+  if (cms::alpakatools::devices<Platform>().empty()) {
+    std::cout << "No devices found, the test will be skipped.\n";
+    exit(EXIT_SUCCESS);
   }
 
-};  // namespace ALPAKA_ACCELERATOR_NAMESPACE
-
-int main() {
-  const auto host = cms::alpakatools::host();
   const auto device = cms::alpakatools::devices<Platform>()[0];
   Queue queue(device);
 
diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc
index b632eb50ce158..bab64ea7a357a 100644
--- a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc
+++ b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc
@@ -29,6 +29,8 @@
 #include "RecoTracker/PixelVertexFinding/plugins/alpaka/splitVertices.h"
 #include "RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.h"
 
+#include "VertexFinder_t.h"
+
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
   using namespace cms::alpakatools;
 
diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h
new file mode 100644
index 0000000000000..0ada94c781446
--- /dev/null
+++ b/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h
@@ -0,0 +1,14 @@
+#ifndef RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h
+#define RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h
+
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+
+namespace ALPAKA_ACCELERATOR_NAMESPACE {
+
+  namespace vertexfinder_t {
+    void runKernels(Queue& queue);
+  }
+
+}  // namespace ALPAKA_ACCELERATOR_NAMESPACE
+
+#endif  // RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h