diff --git a/python/ql/test/experimental/dataflow/coverage/dataflowTest.ql b/python/ql/test/experimental/dataflow/TestUtil/NormalDataflowTest.qll
similarity index 63%
rename from python/ql/test/experimental/dataflow/coverage/dataflowTest.ql
rename to python/ql/test/experimental/dataflow/TestUtil/NormalDataflowTest.qll
index 76cabbfbbbf..30a9c0b1be0 100644
--- a/python/ql/test/experimental/dataflow/coverage/dataflowTest.ql
+++ b/python/ql/test/experimental/dataflow/TestUtil/NormalDataflowTest.qll
@@ -1,6 +1,7 @@
 import python
 import experimental.dataflow.TestUtil.FlowTest
 import experimental.dataflow.testConfig
+private import semmle.python.dataflow.new.internal.PrintNode
 
 class DataFlowTest extends FlowTest {
   DataFlowTest() { this = "DataFlowTest" }
@@ -10,4 +11,8 @@ class DataFlowTest extends FlowTest {
   override predicate relevantFlow(DataFlow::Node source, DataFlow::Node sink) {
     exists(TestConfiguration cfg | cfg.hasFlow(source, sink))
   }
+
+  override predicate hasActualResult(Location location, string element, string tag, string value) {
+    super.hasActualResult(location, element, tag, value)
+  }
 }
diff --git a/python/ql/test/experimental/dataflow/coverage/dataflowTest.expected b/python/ql/test/experimental/dataflow/coverage/NormalDataflowTest.expected
similarity index 100%
rename from python/ql/test/experimental/dataflow/coverage/dataflowTest.expected
rename to python/ql/test/experimental/dataflow/coverage/NormalDataflowTest.expected
diff --git a/python/ql/test/experimental/dataflow/coverage/NormalDataflowTest.ql b/python/ql/test/experimental/dataflow/coverage/NormalDataflowTest.ql
new file mode 100644
index 00000000000..3ee344d0b87
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/coverage/NormalDataflowTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.dataflow.TestUtil.NormalDataflowTest
diff --git a/python/ql/test/experimental/dataflow/fieldflow/dataflowTest.expected b/python/ql/test/experimental/dataflow/fieldflow/NormalDataflowTest.expected
similarity index 100%
rename from python/ql/test/experimental/dataflow/fieldflow/dataflowTest.expected
rename to python/ql/test/experimental/dataflow/fieldflow/NormalDataflowTest.expected
diff --git a/python/ql/test/experimental/dataflow/fieldflow/NormalDataflowTest.ql b/python/ql/test/experimental/dataflow/fieldflow/NormalDataflowTest.ql
new file mode 100644
index 00000000000..3ee344d0b87
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/fieldflow/NormalDataflowTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.dataflow.TestUtil.NormalDataflowTest
diff --git a/python/ql/test/experimental/dataflow/fieldflow/dataflowTest.ql b/python/ql/test/experimental/dataflow/fieldflow/dataflowTest.ql
deleted file mode 100644
index 76cabbfbbbf..00000000000
--- a/python/ql/test/experimental/dataflow/fieldflow/dataflowTest.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-import python
-import experimental.dataflow.TestUtil.FlowTest
-import experimental.dataflow.testConfig
-
-class DataFlowTest extends FlowTest {
-  DataFlowTest() { this = "DataFlowTest" }
-
-  override string flowTag() { result = "flow" }
-
-  override predicate relevantFlow(DataFlow::Node source, DataFlow::Node sink) {
-    exists(TestConfiguration cfg | cfg.hasFlow(source, sink))
-  }
-}
diff --git a/python/ql/test/experimental/dataflow/match/dataflowTest.expected b/python/ql/test/experimental/dataflow/match/NormalDataflowTest.expected
similarity index 100%
rename from python/ql/test/experimental/dataflow/match/dataflowTest.expected
rename to python/ql/test/experimental/dataflow/match/NormalDataflowTest.expected
diff --git a/python/ql/test/experimental/dataflow/match/NormalDataflowTest.ql b/python/ql/test/experimental/dataflow/match/NormalDataflowTest.ql
new file mode 100644
index 00000000000..3ee344d0b87
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/match/NormalDataflowTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.dataflow.TestUtil.NormalDataflowTest
diff --git a/python/ql/test/experimental/dataflow/match/dataflowTest.ql b/python/ql/test/experimental/dataflow/match/dataflowTest.ql
deleted file mode 100644
index 76cabbfbbbf..00000000000
--- a/python/ql/test/experimental/dataflow/match/dataflowTest.ql
+++ /dev/null
@@ -1,13 +0,0 @@
-import python
-import experimental.dataflow.TestUtil.FlowTest
-import experimental.dataflow.testConfig
-
-class DataFlowTest extends FlowTest {
-  DataFlowTest() { this = "DataFlowTest" }
-
-  override string flowTag() { result = "flow" }
-
-  override predicate relevantFlow(DataFlow::Node source, DataFlow::Node sink) {
-    exists(TestConfiguration cfg | cfg.hasFlow(source, sink))
-  }
-}