diff --git a/Framework/src/CheckRunner.cxx b/Framework/src/CheckRunner.cxx
index 32328f92e1..0f954e1546 100644
--- a/Framework/src/CheckRunner.cxx
+++ b/Framework/src/CheckRunner.cxx
@@ -114,7 +114,8 @@ std::string CheckRunner::createCheckRunnerFacility(std::string deviceName)
 
 std::string CheckRunner::createSinkCheckRunnerName(InputSpec input)
 {
-  std::string name(CheckRunner::createCheckRunnerIdString() + "-sink-");
+  // we need a shorter name, thus we only use "qc-sink" and not "qc-check-sink"
+  std::string name("qc-sink-");
   name += DataSpecUtils::label(input);
   return name;
 }
diff --git a/Framework/test/testInfrastructureGenerator.cxx b/Framework/test/testInfrastructureGenerator.cxx
index 20de580742..4879302bde 100644
--- a/Framework/test/testInfrastructureGenerator.cxx
+++ b/Framework/test/testInfrastructureGenerator.cxx
@@ -190,7 +190,15 @@ TEST_CASE("qc_factory_remote_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 6);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 2);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),
@@ -272,7 +280,15 @@ TEST_CASE("qc_factory_standalone_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 5);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 1);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),
@@ -411,7 +427,15 @@ TEST_CASE("qc_infrastructure_remote_batch_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 6);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 2);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),