diff --git a/tests/common/SetupStack.hpp b/tests/common/SetupStack.hpp
index e2bd85f2aeaa903f65854357d5a51834f43f0c57..4a7ceff3ff4590f1bd20a8736aec0ddc4581d704 100644
--- a/tests/common/SetupStack.hpp
+++ b/tests/common/SetupStack.hpp
@@ -31,11 +31,11 @@ namespace corsika::test {
   /*
    * the version without history
    */
-  using Stack = detail::StackWithGeometry;
+  using Stack = detail::StackWithWeight;
 
 #endif
 
   // the correct secondary stack view
   using StackView = typename Stack::stack_view_type;
 
-} // namespace corsika::test
\ No newline at end of file
+} // namespace corsika::test
diff --git a/tests/common/TestStack.hpp b/tests/common/TestStack.hpp
index 2488fc1f059cfa4b4df6ed27a931feff60a62606..934575cb1deef376109b8dcd7c55d1c06e4b1533 100644
--- a/tests/common/TestStack.hpp
+++ b/tests/common/TestStack.hpp
@@ -48,20 +48,33 @@ namespace corsika {
                       node::GeometryData<DummyEnvironment>, StackWithGeometryInterface,
                       DefaultSecondaryProducer>;
 
+    template <typename TStackIter>
+    using SetupWeightDataInterface =
+        typename weights::MakeWeightDataInterface<TStackIter>::type;
+
+    template <typename TStackIter>
+    using StackWithWeightInterface =
+        CombinedParticleInterface<StackWithGeometry::pi_type, SetupWeightDataInterface,
+                                  TStackIter>;
+
+    using StackWithWeight =
+        CombinedStack<typename StackWithGeometry::stack_data_type, weights::WeightData,
+                      StackWithWeightInterface, DefaultSecondaryProducer>;
+
     // ------------------------------------------
     // Add [optional] history data to stack, too:
 
     // combine dummy stack with geometry information for tracking
     template <typename TStackIter>
     using StackWithHistoryInterface =
-        CombinedParticleInterface<StackWithGeometry::pi_type,
+        CombinedParticleInterface<StackWithWeight::pi_type,
                                   history::HistoryEventDataInterface, TStackIter>;
 
     using StackWithHistory =
-        CombinedStack<typename StackWithGeometry::stack_data_type,
+        CombinedStack<typename StackWithWeight::stack_data_type,
                       history::HistoryEventData, StackWithHistoryInterface,
                       history::HistorySecondaryProducer>;
 
   } // namespace test::detail
 
-} // namespace corsika
\ No newline at end of file
+} // namespace corsika