diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index 673b0204864..03e18d7766e 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -19,7 +19,7 @@ from env_helper import (
 from report import create_build_html_report
 from s3_helper import S3Helper
 from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
+from pr_info import NeedsDataType, PRInfo
 from commit_status_helper import (
     get_commit,
     update_mergeable_check,
@@ -28,7 +28,7 @@ from ci_config import CI_CONFIG
 from rerun_helper import RerunHelper
 
 
-NEEDS_DATA_PATH = os.getenv("NEEDS_DATA_PATH")
+NEEDS_DATA_PATH = os.getenv("NEEDS_DATA_PATH", "")
 
 
 class BuildResult:
@@ -98,7 +98,7 @@ def get_failed_report(
 
 
 def process_report(
-    build_report,
+    build_report: dict,
 ) -> Tuple[List[BuildResult], List[List[str]], List[str]]:
     build_config = build_report["build_config"]
     build_result = BuildResult(
@@ -144,16 +144,14 @@ def main():
         os.makedirs(temp_path)
 
     build_check_name = sys.argv[1]
-    needs_data = None
+    needs_data = {}  # type: NeedsDataType
     required_builds = 0
     if os.path.exists(NEEDS_DATA_PATH):
         with open(NEEDS_DATA_PATH, "rb") as file_handler:
             needs_data = json.load(file_handler)
             required_builds = len(needs_data)
 
-    if needs_data is not None and all(
-        i["result"] == "skipped" for i in needs_data.values()
-    ):
+    if needs_data and all(i["result"] == "skipped" for i in needs_data.values()):
         logging.info("All builds are skipped, exiting")
         sys.exit(0)
 
@@ -218,19 +216,21 @@ def main():
     build_logs = []
 
     for build_report in build_reports:
-        build_result, build_artifacts_url, build_logs_url = process_report(build_report)
-        logging.info(
-            "Got %s artifact groups for build report report", len(build_result)
+        _build_results, build_artifacts_url, build_logs_url = process_report(
+            build_report
         )
-        build_results.extend(build_result)
+        logging.info(
+            "Got %s artifact groups for build report report", len(_build_results)
+        )
+        build_results.extend(_build_results)
         build_artifacts.extend(build_artifacts_url)
         build_logs.extend(build_logs_url)
 
     for failed_job in missing_build_names:
-        build_result, build_artifacts_url, build_logs_url = get_failed_report(
+        _build_results, build_artifacts_url, build_logs_url = get_failed_report(
             failed_job
         )
-        build_results.extend(build_result)
+        build_results.extend(_build_results)
         build_artifacts.extend(build_artifacts_url)
         build_logs.extend(build_logs_url)
 
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index f0a371c488f..942edeaa81c 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -2,7 +2,7 @@
 import json
 import logging
 import os
-from typing import Set
+from typing import Dict, Set, Union
 
 from unidiff import PatchSet  # type: ignore
 
@@ -16,6 +16,7 @@ from env_helper import (
 
 FORCE_TESTS_LABEL = "force tests"
 SKIP_MERGEABLE_CHECK_LABEL = "skip mergeable check"
+NeedsDataType = Dict[str, Dict[str, Union[str, Dict[str, str]]]]
 
 DIFF_IN_DOCUMENTATION_EXT = [
     ".html",