diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5344070577b551beadc938d521644061f8062e1f..b028a19ae16f509bd889914bdc363bfcd5f0e1b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-#1.10.7
+#1.10.8
 before_script:
   - cd ${CI_PROJECT_DIR}
 
@@ -35,8 +35,24 @@ stages:
     - mysql
   script:
     - ls -l
+    - php --version
     - if [[ -f tests/integration/prepare.sh ]]; then sh tests/integration/prepare.sh; fi
+    - composer phpunit-integration
+
+.template: &job-test-unit-template
+  <<: *job-test-template
+  script:
+    - ls -l
+    - php --version
+    - composer phpunit-unit
+
+.template: &job-test-integration-oldphp-template
+  <<: *job-test-integration-template
+  script:
+    - ls -l
     - php --version
+    - composer update --no-progress
+    - if [[ -f tests/integration/prepare.sh ]]; then sh tests/integration/prepare.sh; fi
     - composer phpunit-integration
 
 .template: &job-deploy-template
@@ -71,38 +87,30 @@ code style test:
     - composer phpcs
 
 unit test 0:
-  <<: *job-test-template
-  image: wpdesknet/phpunit-woocommerce:0-0
-  script:
-    - ls -l
-    - php --version
-    - composer phpunit-unit
+  <<: *job-test-unit-template
 
-integration test 0-0:
+integration test lastest:
   <<: *job-test-integration-template
-  image: wpdesknet/phpunit-woocommerce:0-0
 
-integration test 1-1:
+integration test php7-1 wc-1:
   <<: *job-test-integration-template
   image: wpdesknet/phpunit-woocommerce:1-1
 
-integration test 2-2:
+integration test php7 wc-2:
   <<: *job-test-integration-template
   image: wpdesknet/phpunit-woocommerce:2-2
 
-integration test 3-3:
+integration test php-7 wc-3:
   <<: *job-test-integration-template
-  image: wpdesknet/phpunit-woocommerce:3-3
-  script:
-    - php --version
-    - phpunit --configuration phpunit-integration.xml
+  image: wpdesknet/phpunit-woocommerce:2-3
 
-integration test 4-3:
-  <<: *job-test-integration-template
-  image: wpdesknet/phpunit-woocommerce:4-3
-  script:
-    - php --version
-    - phpunit --configuration phpunit-integration.xml
+integration test php5-6:
+  <<: *job-test-integration-oldphp-template
+  image: wpdesknet/phpunit-woocommerce:3-0
+
+integration test php5-5:
+  <<: *job-test-integration-oldphp-template
+  image: wpdesknet/phpunit-woocommerce:4-0
 
 apigen docs:
   image:
@@ -135,7 +143,7 @@ pages:
     - tags
 
 build to deploy:
-  image: wpdesknet/phpunit-woocommerce:0-0
+  image: wpdesknet/phpunit-woocommerce:4-0
   stage: pre-deploy
   artifacts:
     expire_in: 1 month
diff --git a/composer.json b/composer.json
index 644bbe75bc9a5361c76f3a9393492266d1f8fdee..aea5e03612042bead22f8d854726445713f86a36 100644
--- a/composer.json
+++ b/composer.json
@@ -10,17 +10,14 @@
         "php": ">=5.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6",
+        "phpunit/phpunit": "*",
         "wp-coding-standards/wpcs": "^0.14.1",
         "squizlabs/php_codesniffer": "^3.0.2",
-        "mockery/mockery": "^1.0",
-        "10up/wp_mock": "^0.3",
+        "mockery/mockery": "*",
+        "10up/wp_mock": "*",
         "wimg/php-compatibility": "^8"
     },
     "autoload-dev": {
-        "psr-4": {
-            "JpkTest\\": "tests"
-        }
     },
     "scripts": {
         "test": "echo composer is alive",