diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 44c9502..d564b2a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -42,6 +42,14 @@ jobs:
         mkdir run
         echo "eula=true" > run/eula.txt
         timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
+      if: INPUT_TIMEOUT == 0
+
+    - name: Run server for ${{ INPUT_TIMEOUT / 60 }} minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt
+        timeout ${{ INPUT_TIMEOUT }} ./gradlew runServer 2>&1 | tee -a server.log || true
+      if: INPUT_TIMEOUT != 0
 
     - name: Test no errors reported during server run
       run: |