diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack
index 920b1d91..2c86936e 100755
--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -313,6 +313,8 @@ function handleModrinthProjects() {
       loader=${HYBRIDTYPE}
     elif isFamily VANILLA; then
       loader=datapack
+    elif isType NEOFORGE; then
+      loader=neoforge
     elif isFamily FORGE; then
       loader=forge
     else
diff --git a/tests/setuponlytests/modrinth-neoforge/docker-compose.yml b/tests/setuponlytests/modrinth-neoforge/docker-compose.yml
new file mode 100644
index 00000000..a2f78dd9
--- /dev/null
+++ b/tests/setuponlytests/modrinth-neoforge/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+  mc:
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "true"
+      SETUP_ONLY: "true"
+      TYPE: NEOFORGE
+      VERSION: 1.21.1
+      MODRINTH_PROJECTS: storagedrawers
+    volumes:
+      - ./data:/data
diff --git a/tests/setuponlytests/modrinth-neoforge/verify.sh b/tests/setuponlytests/modrinth-neoforge/verify.sh
new file mode 100644
index 00000000..2fd6230f
--- /dev/null
+++ b/tests/setuponlytests/modrinth-neoforge/verify.sh
@@ -0,0 +1 @@
+mc-image-helper assert fileExists "mods/StorageDrawers-neoforge-*.jar"