diff --git a/pythonFiles/vscode_pytest/__init__.py b/pythonFiles/vscode_pytest/__init__.py
index 49d429662e3a..adf72c134119 100644
--- a/pythonFiles/vscode_pytest/__init__.py
+++ b/pythonFiles/vscode_pytest/__init__.py
@@ -46,6 +46,15 @@ def __init__(self, message):
 
 
 ERRORS = []
+IS_DISCOVERY = False
+map_id_to_path = dict()
+collected_tests_so_far = list()
+
+
+def pytest_load_initial_conftests(early_config, parser, args):
+    if "--collect-only" in args:
+        global IS_DISCOVERY
+        IS_DISCOVERY = True
 
 
 def pytest_internalerror(excrepr, excinfo):
@@ -70,7 +79,7 @@ def pytest_exception_interact(node, call, report):
     # call.excinfo is the captured exception of the call, if it raised as type ExceptionInfo.
     # call.excinfo.exconly() returns the exception as a string.
     # If it is during discovery, then add the error to error logs.
-    if type(report) == pytest.CollectReport:
+    if IS_DISCOVERY:
         if call.excinfo and call.excinfo.typename != "AssertionError":
             if report.outcome == "skipped" and "SkipTest" in str(call):
                 return
@@ -168,19 +177,6 @@ class testRunResultDict(Dict[str, Dict[str, TestOutcome]]):
     tests: Dict[str, TestOutcome]
 
 
-IS_DISCOVERY = False
-map_id_to_path = dict()
-
-
-def pytest_load_initial_conftests(early_config, parser, args):
-    if "--collect-only" in args:
-        global IS_DISCOVERY
-        IS_DISCOVERY = True
-
-
-collected_tests_so_far = list()
-
-
 def pytest_report_teststatus(report, config):
     """
     A pytest hook that is called when a test is called. It is called 3 times per test,