diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 223a31b9..558b0c61 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -22,5 +22,12 @@ jobs:
             ${{ runner.os }}-pip-
       - name: Run tests
         run: |
-          export COMMANDLINE_ARGS="--tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test --port 80"
-          python launch.py
+          python launch.py --tests basic_features --no-half --disable-opt-split-attention --use-cpu all --skip-torch-cuda-test
+      - name: Upload main app stdout-stderr
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: stdout-stderr
+          path: |
+            ./test/stdout.txt
+            ./test/stderr.txt
diff --git a/launch.py b/launch.py
index 8ed1dffc..ed21d0e6 100644
--- a/launch.py
+++ b/launch.py
@@ -244,6 +244,8 @@ def tests(test_dir):
     if "--ckpt" not in sys.argv:
         sys.argv.append("--ckpt")
         sys.argv.append("./test/test_files/empty.pt")
+    if "--skip-torch-cuda-test" not in sys.argv:
+        sys.argv.append("--skip-torch-cuda-test")
 
     print(f"Launching Web UI in another process for testing with arguments: {' '.join(sys.argv[1:])}")
 
diff --git a/test/advanced_features/extras_test.py b/test/advanced_features/extras_test.py
index 4b8ae25a..8763f8ed 100644
--- a/test/advanced_features/extras_test.py
+++ b/test/advanced_features/extras_test.py
@@ -3,7 +3,7 @@ import unittest
 
 class TestExtrasWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:80/sdapi/v1/extra-single-image"
+        self.url_img2img = "http://localhost:7860/sdapi/v1/extra-single-image"
         self.simple_extras = {
             "resize_mode": 0,
             "show_extras_results": True,
diff --git a/test/advanced_features/txt2img_test.py b/test/advanced_features/txt2img_test.py
index e6c3531a..36ed7b9a 100644
--- a/test/advanced_features/txt2img_test.py
+++ b/test/advanced_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/img2img_test.py b/test/basic_features/img2img_test.py
index c4c9a90f..0a9c1e8a 100644
--- a/test/basic_features/img2img_test.py
+++ b/test/basic_features/img2img_test.py
@@ -6,7 +6,7 @@ from PIL import Image
 
 class TestImg2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_img2img = "http://localhost:80/sdapi/v1/img2img"
+        self.url_img2img = "http://localhost:7860/sdapi/v1/img2img"
         self.simple_img2img = {
             "init_images": [encode_pil_to_base64(Image.open(r"test/test_files/img2img_basic.png"))],
             "resize_mode": 0,
diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py
index 4f1fc77d..fe4af999 100644
--- a/test/basic_features/txt2img_test.py
+++ b/test/basic_features/txt2img_test.py
@@ -4,7 +4,7 @@ import requests
 
 class TestTxt2ImgWorking(unittest.TestCase):
     def setUp(self):
-        self.url_txt2img = "http://localhost:80/sdapi/v1/txt2img"
+        self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img"
         self.simple_txt2img = {
             "enable_hr": False,
             "denoising_strength": 0,
diff --git a/test/basic_features/utils_test.py b/test/basic_features/utils_test.py
index fdb72b9a..9706db8b 100644
--- a/test/basic_features/utils_test.py
+++ b/test/basic_features/utils_test.py
@@ -3,17 +3,17 @@ import requests
 
 class UtilsTests(unittest.TestCase):
   def setUp(self):
-    self.url_options = "http://localhost:80/sdapi/v1/options"
-    self.url_cmd_flags = "http://localhost:80/sdapi/v1/cmd-flags"
-    self.url_samplers = "http://localhost:80/sdapi/v1/samplers"
-    self.url_upscalers = "http://localhost:80/sdapi/v1/upscalers"
-    self.url_sd_models = "http://localhost:80/sdapi/v1/sd-models"
-    self.url_hypernetworks = "http://localhost:80/sdapi/v1/hypernetworks"
-    self.url_face_restorers = "http://localhost:80/sdapi/v1/face-restorers"
-    self.url_realesrgan_models = "http://localhost:80/sdapi/v1/realesrgan-models"
-    self.url_prompt_styles = "http://localhost:80/sdapi/v1/prompt-styles"
-    self.url_artist_categories = "http://localhost:80/sdapi/v1/artist-categories"
-    self.url_artists = "http://localhost:80/sdapi/v1/artists"
+    self.url_options = "http://localhost:7860/sdapi/v1/options"
+    self.url_cmd_flags = "http://localhost:7860/sdapi/v1/cmd-flags"
+    self.url_samplers = "http://localhost:7860/sdapi/v1/samplers"
+    self.url_upscalers = "http://localhost:7860/sdapi/v1/upscalers"
+    self.url_sd_models = "http://localhost:7860/sdapi/v1/sd-models"
+    self.url_hypernetworks = "http://localhost:7860/sdapi/v1/hypernetworks"
+    self.url_face_restorers = "http://localhost:7860/sdapi/v1/face-restorers"
+    self.url_realesrgan_models = "http://localhost:7860/sdapi/v1/realesrgan-models"
+    self.url_prompt_styles = "http://localhost:7860/sdapi/v1/prompt-styles"
+    self.url_artist_categories = "http://localhost:7860/sdapi/v1/artist-categories"
+    self.url_artists = "http://localhost:7860/sdapi/v1/artists"
 
   def test_options_get(self):
     self.assertEqual(requests.get(self.url_options).status_code, 200)
diff --git a/test/server_poll.py b/test/server_poll.py
index e4462b6c..d4df697b 100644
--- a/test/server_poll.py
+++ b/test/server_poll.py
@@ -8,7 +8,7 @@ def run_tests(proc, test_dir):
     start_time = time.time()
     while time.time()-start_time < timeout_threshold:
         try:
-            requests.head("http://localhost:80/")
+            requests.head("http://localhost:7860/")
             break
         except requests.exceptions.ConnectionError:
             if proc.poll() is not None: