diff --git a/bacillus/ci_pushbuild.sh b/bacillus/ci_pushbuild.sh
index 5650f8f..a2d2eff 100755
--- a/bacillus/ci_pushbuild.sh
+++ b/bacillus/ci_pushbuild.sh
@@ -37,8 +37,8 @@ go test -v .
 ############
 stage "Test(Authtoken)"
 ############
-echo "Clearing test user $USER ~/.xs_id file ..."
 if [ -f ~/.xs_id ]; then
+  echo "Clearing test user $USER ~/.xs_id file ..."
   mv ~/.xs_id ~/.xs_id.bak
 fi
 echo "Setting dummy authtoken in ~/.xs_id ..."
@@ -53,6 +53,11 @@ else
   unset tokentest
 fi
 
+if [ -f ~/.xs_id.bak ]; then
+  echo "Restoring test user $USER ~/.xs_id file ..."
+  mv ~/.xs_id.bak ~/.xs_id
+fi
+
 ############
 stage "Test(S->C)"
 ############