diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a1213e308553ae38cf2d4ca5f295d4699792d5e..6996a5520f6bae6c976cf77023259e37e247f9c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,62 @@
 stages:
   - build
+  - test
 
-rust-latest:
-  stage: build
+variables:
+  FEATURES: ""
+  RUST_BACKTRACE: "full"
+
+.stable:
   image: rust:latest
-  script:
-    - cargo build --verbose --features=minidom
-    - cargo test --lib --verbose --features=minidom
+  cache:
+    key: stable
+    paths:
+      - target/
 
-rust-nightly:
-  stage: build
+.nightly:
   image: rustlang/rust:nightly
+  cache:
+    key: nightly
+    paths:
+      - target/
+
+.build:
+  stage: build
+  script:
+    - cargo build --verbose --no-default-features --features=$FEATURES
+
+.test:
+  stage: test
   script:
-    - cargo build --verbose --features=minidom
-    - cargo test --lib --verbose --features=minidom
+    - cargo test --lib --verbose --no-default-features --features=$FEATURES
+
+rust-latest-build:
+  extends:
+    - .build
+    - .stable
+
+rust-nightly-build:
+  extends:
+    - .build
+    - .nightly
+
+
+rust-latest-test:
+  extends:
+    - .test
+    - .stable
+
+rust-nightly-test:
+  extends:
+    - .test
+    - .nightly
+
+rust-latest-build with features=minidom:
+  extends: rust-latest-build
+  variables:
+    FEATURES: "minidom"
+
+rust-latest-test with features=minidom:
+  extends: rust-latest-test
+  variables:
+    FEATURES: "minidom"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a83e53e7937cb77ae6d7a7a149f75b4a157c1d..70108afddf06ed8d5d265b9b95aaeb6e2c235f94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version XXX, released YYY:
+  * Updates
+    - CI: Split jobs, add tests, and caching
+
 Version 0.7.2, released 2019-09-13:
   * Updates
     - Impl Error for JidParseError again, it got removed due to the failure removal but is still wanted.