diff --git a/lib/galaxy_test/api/test_tools.py b/lib/galaxy_test/api/test_tools.py
index e2f16809ee6..800e663c5a9 100644
--- a/lib/galaxy_test/api/test_tools.py
+++ b/lib/galaxy_test/api/test_tools.py
@@ -3186,11 +3186,8 @@ class TestToolsApi(ApiTestCase, TestsTools):
     def test_metadata_validator_can_fail_on_deferred_input(self, history_id):
         # This test fails because we just skip the validator
         # Fixing this is a TODO
-        deferred_bam_details = self.dataset_populator.create_deferred_hda(
-            history_id,
-            "https://github.com/galaxyproject/galaxy/blob/dev/test-data/3unsorted.bam?raw=true",
-            ext="unsorted.bam",
-        )
+        url_1 = self.dataset_populator.base64_url_for_test_file("3unsorted.bam")
+        deferred_bam_details = self.dataset_populator.create_deferred_hda(history_id, url_1, ext="unsorted.bam")
         fasta1_contents = open(self.get_filename("1.fasta")).read()
         fasta = self.dataset_populator.new_dataset(history_id, content=fasta1_contents)
         inputs = {"input1": dataset_to_param(deferred_bam_details), "reference": dataset_to_param(fasta)}
diff --git a/test/unit/tool_shed/test_shed_index.py b/test/unit/tool_shed/test_shed_index.py
index 1bfce9adf3d..3041c6f3448 100644
--- a/test/unit/tool_shed/test_shed_index.py
+++ b/test/unit/tool_shed/test_shed_index.py
@@ -11,7 +11,7 @@ from whoosh import index
 from galaxy.util.compression_utils import CompressedFile
 from tool_shed.util.shed_index import build_index
 
-URL = "https://github.com/mvdbeek/toolshed-test-data/blob/master/toolshed_community_files.tgz?raw=true"
+URL = "https://github.com/mvdbeek/toolshed-test-data/raw/refs/heads/master/toolshed_community_files.tgz"
 
 
 @pytest.fixture