diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1580283f5de64f5a3b05400b76a00f70d861b699..d2980653f82e9d2d5995d62e84d67642a3ad1056 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,43 +1,35 @@
 stages:
-    - builds
-    - tests
+    - build_and_tests
     - clippy
     - fmt
     
 before_script:
     - export PATH="$HOME/.cargo/bin:$PATH"
     
-build:stable:
-  stage: builds
+build_and_tests:stable:
+  stage: build_and_tests
   tags:
     - redshift-rs-stable
   script:
-    - cargo build --all-features
-    
-tests:stable:
-  stage: tests
-  tags:
-    - redshift-rs-stable
-  script:
-    - cargo test
+    - cargo test --all-features
     
 build_and_tests:beta:
-  stage: tests
+  stage: build_and_tests
   tags:
     - redshift-rs-beta
   script:
     - rustup update
-    - cargo test
+    - cargo test --all-features
   when: manual
   allow_failure: true
     
 build_and_tests:nightly:
-  stage: tests
+  stage: tebuild_and_testssts
   image: rustlang/rust:nightly
   tags:
     - redshift-rs-nightly
   script:
-    - cargo test
+    - cargo test --all-features
   when: manual
   allow_failure: true