diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2949ba2..69b6e138 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,11 +28,13 @@ debug:
     - cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
     - cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
     - cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-    - cd ../yavsc && dnu restore --ignore-failed-sources
-    - cd ../test && dnu restore --ignore-failed-sources
+    - cd ../Yavsc && dnu restore --ignore-failed-sources
+    - cd ../test
+    - make restore
+    - make
     - cd ../..
     - make
-
+    
 release:
   stage: deploy
   only:
@@ -47,10 +49,8 @@ release:
     - cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
     - cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
     - cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-    - cd ../yavsc && dnu restore --ignore-failed-sources
-    - cd ../test
-    - make restore
-    - make
+    - cd ../Yavsc && dnu restore --ignore-failed-sources
+
     - cd ../..
     - make packages
 
diff --git a/.travis.yml b/.travis.yml
index a009a47d..9741f2a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ install:
 - cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
 - cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
 - cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-- cd ../yavsc && dnu restore --ignore-failed-sources
-- cd ../test && dnu restore --ignore-failed-sources
+- cd ../Yavsc && dnu restore --ignore-failed-sources
+- cd ../test && make
 script:
 - "dnu build"