diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a04076..ed39df0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,16 +12,10 @@
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
 
 stages:          # List of stages for jobs, and their order of execution
-  - build
-  - test
+  - build-and-test
 
-build-job:       # This job runs in the build stage, which runs first.
-  stage: build
-  script:
-    - make
-
-test-job:        # Check if the program works
-  stage: test    # It only runs when *both* jobs in the test stage complete successfully.
+build-and-test:  # Build and check if the program works
+  stage: build-and-test
   environment: production
   script:
-    - . ./test.sh
+    - make && . ./test.sh