diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24c4635d..b23e18ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,22 @@
-image: shinyay/docker-mvn-jdk8:3.5.0
-
 variables:
-  # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
-  # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
-  # As of Maven 3.4.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
-  # when running from the command line.
-  # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
-  MAVEN_CLI_OPTS: "--batch-mode --errors --show-version"
+  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
 
-# Cache downloaded dependencies and plugins between builds.
-# To keep cache across branches add 'key: "$CI_JOB_NAME"'
 cache:
   paths:
     - .m2/repository/
+    - target/
 
 build:
   stage: build
   script:
-    - 'mvn $MAVEN_CLI_OPTS clean install'
+    - mvn $MAVEN_CLI_OPTS clean install -Dmaven.test.skip=true
+  tags:
+    - OracleJDK1.8
+
+test:
+  stage: test
+  script:
+    - mvn $MAVEN_CLI_OPTS test
+  tags:
+    - OracleJDK1.8
\ No newline at end of file