diff --git a/js-old/scripts/test.js b/js-old/scripts/test.js
index e62cd8fb9..7121de462 100644
--- a/js-old/scripts/test.js
+++ b/js-old/scripts/test.js
@@ -1 +1 @@
-// test script 27
+// test script 28
diff --git a/js/scripts/test.js b/js/scripts/test.js
index af9d47527..2e8d5bdf5 100644
--- a/js/scripts/test.js
+++ b/js/scripts/test.js
@@ -1 +1 @@
-// test script 33
+// test script 34
diff --git a/scripts/gitlab-test.sh b/scripts/gitlab-test.sh
index 85d854b37..8061a0c83 100755
--- a/scripts/gitlab-test.sh
+++ b/scripts/gitlab-test.sh
@@ -2,62 +2,76 @@
 #ARGUMENT test for RUST, JS, COVERAGE or JS_RELEASE
 set -e # fail on any error
 set -u # treat unset variables as error
-export JS_FILES_MODIFIED="$(git --no-pager diff --name-only master...$CI_BUILD_REF | grep ^js/ | wc -l)"
-export JS_OLD_FILES_MODIFIED="$(git --no-pager diff --name-only master...$CI_BUILD_REF | grep ^js-old/ | wc -l)"
-export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only master...$CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)"
-export RUST_BACKTRACE=1
+if [[ "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" ]]; then
+  export GIT_COMPARE=$CI_BUILD_REF_NAME;
+else
+  export GIT_COMPARE=master;  
+fi
+if [[ "$(git rev-parse $GIT_COMPARE)" == "$CI_COMMIT_SHA" ]]; then
+  # Always build everything if we're on master, beta, stable
+  export JS_FILES_MODIFIED=1
+  export JS_OLD_FILES_MODIFIED=1
+  export RUST_FILES_MODIFIED=1
+else
+  export JS_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep ^js/ | wc -l)"
+  export JS_OLD_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep ^js-old/ | wc -l)"
+  export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ | wc -l)"
+fi
 TEST_SWITCH=$1
 rust_test () {
   git submodule update --init --recursive
   rustup show
-  if [[ "${RUST_FILES_MODIFIED}" != "0" ]];
+  echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
+	if [[ "${RUST_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping Rust tests since no Rust files modified.";
     else ./test.sh;
   fi
-  if [ "$CI_BUILD_REF_NAME" == "nightly" ];
+  if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
     then sh scripts/aura-test.sh;
   fi
 }
 js_test () {
   git submodule update --init --recursive
-  if [[ "${JS_FILES_MODIFIED}" != "0" ]];
+	echo "JS_FILES_MODIFIED: $JS_FILES_MODIFIED"
+  if [[ "${JS_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS deps install since no JS files modified.";
     else ./js/scripts/install-deps.sh;
   fi
-  if [[ "${JS_OLD_FILES_MODIFIED}" != "0"  ]];
+  echo "JS_OLD_FILES_MODIFIED: $JS_OLD_FILES_MODIFIED"
+	if [[ "${JS_OLD_FILES_MODIFIED}" == "0"  ]];
     then echo "Skipping JS (old) deps install since no JS files modified.";
     else ./js-old/scripts/install-deps.sh;
   fi
-  if [[ "${JS_FILES_MODIFIED}" != "0" ]];
+  if [[ "${JS_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS lint since no JS files modified.";
     else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh;
   fi
-  if [[ "${JS_OLD_FILES_MODIFIED}" != "0" ]];
+  if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS (old) lint since no JS files modified.";
     else ./js-old/scripts/lint.sh && ./js-old/scripts/test.sh && ./js-old/scripts/build.sh;
   fi
 }
 js_release () {
   rustup default stable
-  echo "${JS_FILES_MODIFIED}"
-  if [[ "${JS_FILES_MODIFIED}" != "0" ]];
+  echo "JS_FILES_MODIFIED: $JS_FILES_MODIFIED"
+  if [[ "${JS_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS deps install since no JS files modified.";
     else ./js/scripts/install-deps.sh;
   fi
-  if [[ "${JS_FILES_MODIFIED}" -eq 0 ]];
+  if [[ "${JS_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS rebuild since no JS files modified.";
     else ./js/scripts/build.sh && ./js/scripts/push-precompiled.sh;
   fi
-  echo "${JS_OLD_FILES_MODIFIED}"
-  if [[ "${JS_OLD_FILES_MODIFIED}" != "0" ]];
+  echo "JS_OLD_FILES_MODIFIED: $JS_OLD_FILES_MODIFIED"
+  if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS (old) deps install since no JS files modified.";
     else ./js-old/scripts/install-deps.sh;
   fi
-  if [[ "${JS_OLD_FILES_MODIFIED}" != "0" ]];
+  if [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping JS (old) rebuild since no JS files modified.";
     else ./js-old/scripts/build.sh && ./js-old/scripts/push-precompiled.sh;
   fi
-  if [[ "${JS_FILES_MODIFIED}" != "0" ]] && [[ "${JS_OLD_FILES_MODIFIED}" != "0" ]];
+  if [[ "${JS_FILES_MODIFIED}" == "0" ]] && [[ "${JS_OLD_FILES_MODIFIED}" == "0" ]];
     then echo "Skipping Cargo update since no JS files modified.";
     else ./js/scripts/push-cargo.sh;
   fi