diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello.tgz b/testsuite/tests/workflows/air-gapping/my_index/crates/hello.tgz
new file mode 100644
index 000000000..a39010d27
Binary files /dev/null and b/testsuite/tests/workflows/air-gapping/my_index/crates/hello.tgz differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/HEAD b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/config b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/config
deleted file mode 100644
index 07d359d07..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/description b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/description
deleted file mode 100644
index 498b267a8..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/15/cb23051f1ff3a6684a57531e46df799d5824f2 b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/15/cb23051f1ff3a6684a57531e46df799d5824f2
deleted file mode 100644
index da7b004a2..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/15/cb23051f1ff3a6684a57531e46df799d5824f2 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/2b/5f082653488d19f6108867e493b657e75320ce b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/2b/5f082653488d19f6108867e493b657e75320ce
deleted file mode 100644
index a54124a71..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/2b/5f082653488d19f6108867e493b657e75320ce and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/62/36aa7e1dbdd096427ed632c7d4755983c12d33 b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/62/36aa7e1dbdd096427ed632c7d4755983c12d33
deleted file mode 100644
index 634f0ada7..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/62/36aa7e1dbdd096427ed632c7d4755983c12d33 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/69/e7a181416f665433500caf06d9d4b9b897b133 b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/69/e7a181416f665433500caf06d9d4b9b897b133
deleted file mode 100644
index 4f9575503..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/69/e7a181416f665433500caf06d9d4b9b897b133 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/cd/89b04bec4c8580f565b34a3aef11716e3ce963 b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/cd/89b04bec4c8580f565b34a3aef11716e3ce963
deleted file mode 100644
index a9e8db0e0..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/objects/cd/89b04bec4c8580f565b34a3aef11716e3ce963
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��=
-1F�s��,���g"����'�$��`��^߀'�+���Z��
=�z
�3�h�-�YCd�N�h�C61�9��D�?�Y<$�}�
N%�v�̩69�ZΣ:9���A��A�[�=u{�}�����4�
\ No newline at end of file
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/packed-refs b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/packed-refs
deleted file mode 100644
index ea2add0f1..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted
-cd89b04bec4c8580f565b34a3aef11716e3ce963 refs/heads/master
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/hello/refs/.emptydir b/testsuite/tests/workflows/air-gapping/my_index/crates/hello/refs/.emptydir
deleted file mode 100644
index e69de29bb..000000000
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello.tgz b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello.tgz
new file mode 100644
index 000000000..c5882e61a
Binary files /dev/null and b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello.tgz differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/HEAD b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/config b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/config
deleted file mode 100644
index 07d359d07..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/description b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/description
deleted file mode 100644
index 498b267a8..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/10/dbaf3d2d4ceaad2d7f4785b4aa0d1f912b38e5 b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/10/dbaf3d2d4ceaad2d7f4785b4aa0d1f912b38e5
deleted file mode 100644
index acc1322e7..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/10/dbaf3d2d4ceaad2d7f4785b4aa0d1f912b38e5 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/23/1e491e1a187b52dd5e94238e5170cb4de37ce1 b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/23/1e491e1a187b52dd5e94238e5170cb4de37ce1
deleted file mode 100644
index 6a77d313b..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/23/1e491e1a187b52dd5e94238e5170cb4de37ce1 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/33/053304cbc00068c0963822cd51a309ae42ff00 b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/33/053304cbc00068c0963822cd51a309ae42ff00
deleted file mode 100644
index ec6a49127..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/33/053304cbc00068c0963822cd51a309ae42ff00 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/60/cb127eb6ba5c883490c4c8ada38e4a15347092 b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/60/cb127eb6ba5c883490c4c8ada38e4a15347092
deleted file mode 100644
index c262623ea..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/60/cb127eb6ba5c883490c4c8ada38e4a15347092 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/82/65f7ebea39d73db9675fc91495b448ed5960ec b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/82/65f7ebea39d73db9675fc91495b448ed5960ec
deleted file mode 100644
index 321d28649..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/82/65f7ebea39d73db9675fc91495b448ed5960ec
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��A
-�0P�9��\2�4�)�+�<�t:�@c ���<�����ߗ�R�`/�P�*�o�dD���wNfo�p`�ܲ ��;x���w�&���3K.z��Ʀ�`�yOpj�ֶ������k�~����4�
\ No newline at end of file
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/c6/a9c4c3965544f12ce8cc39e8c14a55f43dde91 b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/c6/a9c4c3965544f12ce8cc39e8c14a55f43dde91
deleted file mode 100644
index 03f4991fe..000000000
Binary files a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/objects/c6/a9c4c3965544f12ce8cc39e8c14a55f43dde91 and /dev/null differ
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/packed-refs b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/packed-refs
deleted file mode 100644
index 4cceaabf1..000000000
--- a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted
-8265f7ebea39d73db9675fc91495b448ed5960ec refs/heads/master
diff --git a/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/refs/.emptydir b/testsuite/tests/workflows/air-gapping/my_index/crates/libhello/refs/.emptydir
deleted file mode 100644
index e69de29bb..000000000
diff --git a/testsuite/tests/workflows/air-gapping/my_index/index/he/hello/hello-1.0.1.toml b/testsuite/tests/workflows/air-gapping/my_index/index/he/hello/hello-1.0.1.toml
index b5ab4c848..05221fc60 100644
--- a/testsuite/tests/workflows/air-gapping/my_index/index/he/hello/hello-1.0.1.toml
+++ b/testsuite/tests/workflows/air-gapping/my_index/index/he/hello/hello-1.0.1.toml
@@ -8,5 +8,4 @@ maintainers-logins = ["mylogin"]
 libhello = "^1.0"
 
 [origin]
-url = "git+file:../../../crates/hello"
-commit = "cd89b04bec4c8580f565b34a3aef11716e3ce963"
+url = "file:../../../crates/hello.tgz"
diff --git a/testsuite/tests/workflows/air-gapping/my_index/index/li/libhello/libhello-1.0.0.toml b/testsuite/tests/workflows/air-gapping/my_index/index/li/libhello/libhello-1.0.0.toml
index a5b2604c8..b1d856d2a 100644
--- a/testsuite/tests/workflows/air-gapping/my_index/index/li/libhello/libhello-1.0.0.toml
+++ b/testsuite/tests/workflows/air-gapping/my_index/index/li/libhello/libhello-1.0.0.toml
@@ -5,5 +5,4 @@ maintainers = ["alejandro@mosteo.com"]
 maintainers-logins = ["mylogin"]
 
 [origin]
-url = "git+file:../../../crates/libhello"
-commit = "8265f7ebea39d73db9675fc91495b448ed5960ec"
+url = "file:../../../crates/libhello.tgz"
diff --git a/testsuite/tests/workflows/air-gapping/test.py b/testsuite/tests/workflows/air-gapping/test.py
index dd59545bd..396688547 100644
--- a/testsuite/tests/workflows/air-gapping/test.py
+++ b/testsuite/tests/workflows/air-gapping/test.py
@@ -11,10 +11,10 @@
 from drivers.asserts import assert_eq, assert_match
 
 
-# Mock git, curl, gprbuild etc. with dummy scripts
+# Mock tar, git, curl, gprbuild etc. with dummy scripts
 os.mkdir("path-dir")
 os.chdir("path-dir")
-for executable in ("git", "hg", "svn", "curl", "gprbuild"):
+for executable in ("tar", "git", "hg", "svn", "curl", "gprbuild"):
     with open(executable, "w") as f:
         f.write("\n".join([
             "#!/usr/bin/env python",
@@ -27,21 +27,21 @@
 os.chdir("..")
 
 
-# Run `alr get hello`. This will fail because git is unavailable.
+# Run `alr get hello`. This will fail because tar is unavailable.
 p = run_alr("get", "hello", quiet=False, complain_on_error=False)
 assert_match(".*Mocked command called", p.out)
-assert_match(".*Deployment of commit .* from .* to .* failed", p.out)
+assert_match(".*Deployment of path .* to .* failed", p.out)
 
-# Disable git mocking and run `alr get hello` to 'download' the crate and its
+# Disable tar mocking and run `alr get hello` to 'download' the crate and its
 # dependencies.
-os.remove(os.path.join("path-dir", "git"))
+os.remove(os.path.join("path-dir", "tar"))
 p = run_alr("get", "hello", quiet=False)
 assert_match(r".*hello=1\.0\.1 successfully retrieved", p.out)
 assert_match(r".*\+ libhello 1\.0\.0 \(new\)", p.out)
 
-# Re-enable git mocking and make the index unavailable to simulate disconnection
+# Re-enable tar mocking and make the index unavailable to simulate disconnection
 # from the network
-shutil.copy(os.path.join("path-dir", "curl"), os.path.join("path-dir", "git"))
+shutil.copy(os.path.join("path-dir", "curl"), os.path.join("path-dir", "tar"))
 shutil.move("my_index", "somewhere_else")
 
 # Simulate transferring to a different system by clearing the alr-config
@@ -50,7 +50,7 @@
 for f in os.listdir("alr-config"):
     if f != "settings.toml":
         shutil.rmtree(os.path.join("alr-config", f))
-shutil.move(f"hello_1.0.1_cd89b04b", "hello")
+shutil.move(f"hello_1.0.1_filesystem", "hello")
 
 # Run `alr build`. This will fail because gprbuild is unavailable.
 os.chdir(f"hello")
@@ -58,7 +58,7 @@
 assert_match(".*Mocked command called", p.out)
 assert_match(r'.*Command \["gprbuild", .*\] exited with code 1', p.out)
 
-# Disable gprbuild mocking and run `alr build` to build the crate (with git
+# Disable gprbuild mocking and run `alr build` to build the crate (with tar
 # mocking still enabled to check it doesn't try to fetch anything else)
 os.remove(os.path.join("..", "path-dir", "gprbuild"))
 p = run_alr("build", quiet=False)
@@ -73,8 +73,11 @@
 # attempts (and fails) to re-fetch them
 shutil.rmtree(os.path.join("alire", "cache", "dependencies"))
 p = run_alr("build", quiet=False, complain_on_error=False)
-assert_match(".*Mocked command called", p.out)
-assert_match(".*Deployment of commit .* from .* to .* failed", p.out)
+assert_match(
+    ".*Filesystem crate is neither a folder nor a source archive: ",
+    p.out
+)
+assert_match(".*Deployment of path .* to .* failed", p.out)
 
 
 print("SUCCESS")