diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f039841ac..774353b79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ test-linux:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-stable
 
@@ -124,7 +124,7 @@ docs-jsonrpc:
 cargo-audit:
   stage:                           optional
   script:
-    - scripts/gitlab/audit.sh
+    - scripts/gitlab/cargo-audit.sh
   tags:
     - rust-stable
 
@@ -134,7 +134,7 @@ test-android:
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-arm
 
@@ -146,7 +146,7 @@ test-darwin:
     CXX:                           g++
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-osx
 
@@ -156,7 +156,7 @@ test-windows:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
     RUN_TESTS:                     "true"
   script:
-    - sh scripts/gitlab/test.sh stable
+    - sh scripts/gitlab/test-all.sh stable
   tags:
    - rust-windows
 
@@ -165,7 +165,7 @@ test-beta:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh beta
+    - scripts/gitlab/test-all.sh beta
   tags:
     - rust-beta
 
@@ -174,6 +174,6 @@ test-nightly:
   variables:
     RUN_TESTS:                     "true"
   script:
-    - scripts/gitlab/test.sh nightly
+    - scripts/gitlab/test-all.sh nightly
   tags:
     - rust-nightly
diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh
index bd755e48d..fb2f1ec41 100755
--- a/scripts/gitlab/build-windows.sh
+++ b/scripts/gitlab/build-windows.sh
@@ -25,11 +25,11 @@ time cargo build --target $CARGO_TARGET --release -p ethkey-cli
 time cargo build --target $CARGO_TARGET --release -p whisper-cli
 
 echo "__________Sign binaries__________"
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe
-scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/whisper.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe
+scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/whisper.exe
 
 echo "_____ Post-processing binaries _____"
 rm -rf artifacts
diff --git a/scripts/gitlab/audit.sh b/scripts/gitlab/cargo-audit.sh
similarity index 100%
rename from scripts/gitlab/audit.sh
rename to scripts/gitlab/cargo-audit.sh
diff --git a/scripts/gitlab/sign.cmd b/scripts/gitlab/sign-win.cmd
similarity index 100%
rename from scripts/gitlab/sign.cmd
rename to scripts/gitlab/sign-win.cmd
diff --git a/scripts/gitlab/test.sh b/scripts/gitlab/test-all.sh
similarity index 100%
rename from scripts/gitlab/test.sh
rename to scripts/gitlab/test-all.sh