diff --git a/fedora-image-tester/pyproject.toml b/fedora-image-tester/pyproject.toml
index 753d990..bda2201 100644
--- a/fedora-image-tester/pyproject.toml
+++ b/fedora-image-tester/pyproject.toml
@@ -16,7 +16,7 @@ dependencies = [
     "fedfind",
     "fedora-messaging",
     "fedora-image-uploader-messages",
-    "mslisa[azure,aws]",
+    "mslisa[azure,aws] @ git+https://github.com/microsoft/lisa.git",
 ]
 
 [project.optional-dependencies]
@@ -33,6 +33,20 @@ path = "fedora_image_tester/__init__.py"
 # Required for LISA since they don't publish releases to PyPI yet
 allow-direct-references = true
 
+[tool.hatch.envs.hatch-test]
+features = ["test"]
+extra-dependencies = [
+    "fedora-image-uploader-messages @ {root:uri}/../fedora-image-uploader-messages",
+]
+
+# mslisa pins pluggy<0.14 which conflicts with the pluggy>=1.4 required by
+# modern pytest. Tell uv (hatch's resolver) to ignore mslisa's pluggy pin so
+# the test environment can resolve.
+[tool.uv]
+override-dependencies = [
+    "pluggy>=1.4",
+]
+
 [tool.black]
 line-length = 100
 
diff --git a/fedora-image-uploader-messages/pyproject.toml b/fedora-image-uploader-messages/pyproject.toml
index 117af74..e41b253 100644
--- a/fedora-image-uploader-messages/pyproject.toml
+++ b/fedora-image-uploader-messages/pyproject.toml
@@ -52,6 +52,9 @@ test = [
 [tool.hatch.version]
 path = "fedora_image_uploader_messages/__init__.py"
 
+[tool.hatch.envs.hatch-test]
+features = ["test"]
+
 [tool.black]
 line-length = 100
 
diff --git a/fedora-image-uploader/pyproject.toml b/fedora-image-uploader/pyproject.toml
index 182d4b5..773c9f8 100644
--- a/fedora-image-uploader/pyproject.toml
+++ b/fedora-image-uploader/pyproject.toml
@@ -54,6 +54,12 @@ fedora-image-uploader = "fedora_image_uploader.cli:main"
 [tool.hatch.version]
 path = "fedora_image_uploader/__init__.py"
 
+[tool.hatch.envs.hatch-test]
+features = ["test", "aws", "azure", "gcp"]
+extra-dependencies = [
+    "fedora-image-uploader-messages @ {root:uri}/../fedora-image-uploader-messages",
+]
+
 [tool.black]
 line-length = 100