diff --git a/Framework/SINQ/test/PoldiIndexKnownCompoundsTest.h b/Framework/SINQ/test/PoldiIndexKnownCompoundsTest.h
index 302ef9bc8294228df0a9c860c3078b5ae7149a1d..a506a6a9f004f643be685cc4203f84be3ffec0f5 100644
--- a/Framework/SINQ/test/PoldiIndexKnownCompoundsTest.h
+++ b/Framework/SINQ/test/PoldiIndexKnownCompoundsTest.h
@@ -37,13 +37,13 @@ public:
     /* In this test, peaks from PoldiMockInstrumentHelpers (Silicon)
      * are indexed using theoretical Si-peaks.
      */
-    WorkspaceCreationHelper::storeWS(
-        "measured_SI",
-        PoldiPeakCollectionHelpers::createPoldiPeakTableWorkspace());
-    WorkspaceCreationHelper::storeWS(
-        "Si",
+    auto wsMeasuredSi =
+        PoldiPeakCollectionHelpers::createPoldiPeakTableWorkspace();
+    WorkspaceCreationHelper::storeWS("measured_SI", wsMeasuredSi);
+    auto wsSi =
         PoldiPeakCollectionHelpers::createTheoreticalPeakCollectionSilicon()
-            ->asTableWorkspace());
+            ->asTableWorkspace();
+    WorkspaceCreationHelper::storeWS("Si", wsSi);
 
     std::string outWSName("PoldiIndexKnownCompoundsTest_OutputWS");
 
@@ -670,8 +670,8 @@ private:
 
   void storeRandomWorkspaces(const std::vector<std::string> &wsNames) {
     for (const auto &wsName : wsNames) {
-      WorkspaceCreationHelper::storeWS(
-          wsName, WorkspaceCreationHelper::create1DWorkspaceRand(10, true));
+      auto ws = WorkspaceCreationHelper::create1DWorkspaceRand(10, true)
+          WorkspaceCreationHelper::storeWS(wsName, ws);
     }
   }