diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cea6d49cc..c6669772b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,33 +50,6 @@ test-linux:
   tags:
     - rust-stable
 
-test-darwin:
-  stage:                           test
-  variables:
-    CARGO_TARGET:                  x86_64-apple-darwin
-    CC:                            gcc
-    CXX:                           g++
-    RUN_TESTS:                     "true"
-  script:
-    - scripts/gitlab/test.sh stable
-  tags:
-    - rust-osx
-
-test-windows:
-  stage:                           test
-  cache:
-    key:                           "${CI_JOB_NAME}"
-    paths:
-      - "%CI_PROJECT_DIR%/target/"
-      - "%CI_PROJECT_DIR%/cargo/"
-  variables:
-    CARGO_TARGET:                  x86_64-pc-windows-msvc
-    RUN_TESTS:                     "true"
-  script:
-    - sh scripts/gitlab/test.sh stable
-  tags:
-   - rust-windows
-
 build-linux:
   stage:                           build
   only:                            *releaseable_branches
@@ -164,6 +137,33 @@ misc-android:
   tags:
     - rust-arm
 
+misc-darwin:
+  stage:                           misc
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
+    RUN_TESTS:                     "true"
+  script:
+    - scripts/gitlab/test.sh stable
+  tags:
+    - rust-osx
+
+misc-windows:
+  stage:                           misc
+  cache:
+    key:                           "${CI_JOB_NAME}"
+    paths:
+      - "%CI_PROJECT_DIR%/target/"
+      - "%CI_PROJECT_DIR%/cargo/"
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    RUN_TESTS:                     "true"
+  script:
+    - sh scripts/gitlab/test.sh stable
+  tags:
+   - rust-windows
+
 misc-beta:
   stage:                           misc
   variables: