diff --git a/python/ql/test/2/extractor-tests/import_depth/test.ql b/python/ql/test/2/extractor-tests/import_depth/test.ql
index ef626455fad..4f007e99468 100644
--- a/python/ql/test/2/extractor-tests/import_depth/test.ql
+++ b/python/ql/test/2/extractor-tests/import_depth/test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m
 /* Exclude the builtins module as it has a different name under 2 and 3. */
diff --git a/python/ql/test/2/extractor-tests/object_hash/Success.ql b/python/ql/test/2/extractor-tests/object_hash/Success.ql
index 9cff9ee4b73..55e38e56b93 100644
--- a/python/ql/test/2/extractor-tests/object_hash/Success.ql
+++ b/python/ql/test/2/extractor-tests/object_hash/Success.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 where exists(theSysModuleObject())
 select 1
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql
index 620944de5b9..60989ff8645 100644
--- a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql
+++ b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ExceptFlowNode ex, Value val
 where ex.handledException(val, _, _)
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Known.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Known.ql
index 56498054f51..b773a172ee3 100644
--- a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Known.ql
+++ b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Known.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r
 select r.getLocation().getStartLine(), r.toString(), r.getARaisedType().toString()
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql
index f8e4a4b7dac..00cf5a7d2af 100644
--- a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql
+++ b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Likely.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ControlFlowNode r, ControlFlowNode s
 where
diff --git a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql
index 29bad86bf0f..fe0fa6b0158 100644
--- a/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql
+++ b/python/ql/test/2/library-tests/ControlFlow/Exceptions/Unknown.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r
 where r.raisesUnknownType()
diff --git a/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql b/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql
index e77849860c7..ba8df441caf 100644
--- a/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql
+++ b/python/ql/test/2/library-tests/PointsTo/import_time/Pruned.ql
@@ -1,6 +1,5 @@
 import python
-import semmle.python.pointsto.PointsTo
-import semmle.python.pointsto.PointsToContext
+private import LegacyPointsTo
 
 from ControlFlowNode f, Location l, Context c
 where
diff --git a/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql b/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql
index 68eec976105..0644e4cdf74 100644
--- a/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql
+++ b/python/ql/test/2/library-tests/PointsTo/metaclass/test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls
 where not cls.isC()
diff --git a/python/ql/test/2/library-tests/classes/attr/class_attr.ql b/python/ql/test/2/library-tests/classes/attr/class_attr.ql
index 197ab1a1e5e..1c9c5513a1d 100644
--- a/python/ql/test/2/library-tests/classes/attr/class_attr.ql
+++ b/python/ql/test/2/library-tests/classes/attr/class_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name, Object obj
 where
diff --git a/python/ql/test/2/library-tests/classes/attr/class_has_attr.ql b/python/ql/test/2/library-tests/classes/attr/class_has_attr.ql
index be8272d1bd6..24724f4d859 100644
--- a/python/ql/test/2/library-tests/classes/attr/class_has_attr.ql
+++ b/python/ql/test/2/library-tests/classes/attr/class_has_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, int line, string name
 where
diff --git a/python/ql/test/2/library-tests/classes/attr/list_attr.ql b/python/ql/test/2/library-tests/classes/attr/list_attr.ql
index c38694d5883..ad708711df4 100644
--- a/python/ql/test/2/library-tests/classes/attr/list_attr.ql
+++ b/python/ql/test/2/library-tests/classes/attr/list_attr.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, Object what
 where
diff --git a/python/ql/test/2/library-tests/classes/mro/mro.ql b/python/ql/test/2/library-tests/classes/mro/mro.ql
index 0c4cf077adb..6a4d21921a1 100644
--- a/python/ql/test/2/library-tests/classes/mro/mro.ql
+++ b/python/ql/test/2/library-tests/classes/mro/mro.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, ClassObject l, ClassObject r
 where
diff --git a/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql b/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql
index 50f79a57aed..27394e03096 100644
--- a/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql
+++ b/python/ql/test/2/library-tests/modules/general/moduleobject_test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where m.getName() = "package" or m.getName() = "confused_elements"
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql b/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql
index 6c16450f313..f7755b92e12 100644
--- a/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql
+++ b/python/ql/test/2/library-tests/modules/package_members/module_attributes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC()
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_exports.ql b/python/ql/test/2/library-tests/modules/package_members/module_exports.ql
index bcfc0c60bfb..d04ef3bc9f3 100644
--- a/python/ql/test/2/library-tests/modules/package_members/module_exports.ql
+++ b/python/ql/test/2/library-tests/modules/package_members/module_exports.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC() and m.exports(name)
diff --git a/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql b/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql
index 50ded7b4124..97cc2e86665 100644
--- a/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql
+++ b/python/ql/test/2/library-tests/modules/package_members/module_import_as.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleObject m, string name
 where not m.isC() and m.importedAs(name)
diff --git a/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql b/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql
index 5f776e2374e..0469f804ab3 100644
--- a/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql
+++ b/python/ql/test/2/library-tests/modules/usage/ModuleUsage.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ModuleValue mv, string usage
 where
diff --git a/python/ql/test/2/library-tests/types/classes/mro_test.ql b/python/ql/test/2/library-tests/types/classes/mro_test.ql
index fa2ac44d4d2..8d68b5b08fe 100644
--- a/python/ql/test/2/library-tests/types/classes/mro_test.ql
+++ b/python/ql/test/2/library-tests/types/classes/mro_test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls
 where not cls.isC()
diff --git a/python/ql/test/2/library-tests/types/classes/new_style.ql b/python/ql/test/2/library-tests/types/classes/new_style.ql
index 2af40565329..fdd8fac80a8 100644
--- a/python/ql/test/2/library-tests/types/classes/new_style.ql
+++ b/python/ql/test/2/library-tests/types/classes/new_style.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string style
 where
diff --git a/python/ql/test/2/library-tests/types/exceptions/ExitRaises.ql b/python/ql/test/2/library-tests/types/exceptions/ExitRaises.ql
index 415db290a05..5bf1ae1da00 100644
--- a/python/ql/test/2/library-tests/types/exceptions/ExitRaises.ql
+++ b/python/ql/test/2/library-tests/types/exceptions/ExitRaises.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from RaisingNode r, Scope s, ClassObject cls
 where r.viableExceptionalExit_objectapi(s, cls)
diff --git a/python/ql/test/2/library-tests/types/exceptions/Raises.ql b/python/ql/test/2/library-tests/types/exceptions/Raises.ql
index 2415c707967..e4f9a6664d5 100644
--- a/python/ql/test/2/library-tests/types/exceptions/Raises.ql
+++ b/python/ql/test/2/library-tests/types/exceptions/Raises.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject f, string type
 where
diff --git a/python/ql/test/2/library-tests/types/functions/Calls.ql b/python/ql/test/2/library-tests/types/functions/Calls.ql
index 6fc188753e5..5eaeb4559b0 100644
--- a/python/ql/test/2/library-tests/types/functions/Calls.ql
+++ b/python/ql/test/2/library-tests/types/functions/Calls.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject func, ControlFlowNode call
 where func.getACall() = call
diff --git a/python/ql/test/2/library-tests/types/functions/Never.ql b/python/ql/test/2/library-tests/types/functions/Never.ql
index 1e43ead7dce..932121d058e 100644
--- a/python/ql/test/2/library-tests/types/functions/Never.ql
+++ b/python/ql/test/2/library-tests/types/functions/Never.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from FunctionObject func
 where func.neverReturns()
diff --git a/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql b/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql
index beb955e1188..d35deea34bf 100644
--- a/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql
+++ b/python/ql/test/2/library-tests/types/functions/ReturnTypes.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from PyFunctionObject func, ClassObject ret_type
 where func.getAnInferredReturnType() = ret_type
diff --git a/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql b/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql
index 24766db9f2e..9ab0b5e4bbd 100644
--- a/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql
+++ b/python/ql/test/2/library-tests/types/properties/BuiltinProperties.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 from ClassObject cls, string name, BuiltinPropertyObject p
 where