diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 880b278e..90b77c19 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,12 +30,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Echo
-        run: |
-          echo $JF_CLI_TEST_URL
-          echo ${{ secrets.JFROG_CLI_TEST_URL }}
-          echo $JF_CLI_TEST_USER
-
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Unlabel 'safe to test'
+        uses: actions-ecosystem/action-remove-labels@v1
+        if: ${{ github.event_name != 'push' }}
+        with:
+            labels: "safe to test"
       # Install required tools
       - name: Set up Java
         uses: actions/setup-java@v3
diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java
index db11b017..dd550ab3 100644
--- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java
+++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java
@@ -30,9 +30,10 @@ public class JfrogCliDriverTest {
     private final SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss");
     private final Map<String, String> testEnv = new HashMap<>();
     private JfrogCliDriver jfrogCliDriver;
-    private final String PASSWORD = "ide-plugins-common-test-password";
-    private final String USER_NAME = "ide-plugins-common-test-user";
-    private final String SERVER_URL = "https://ide/plugins/common/test/";
+    private final String PASSWORD = System.getenv("JF_CLI_TEST_PASSWORD");
+    private final String USER_NAME = System.getenv("JF_CLI_TEST_USER");
+    private final String SERVER_URL = System.getenv("JF_CLI_TEST_URL");
+    private final String ACCESS_TOKEN = System.getenv("JF_CLI_TEST_ACCESS_TOKEN");
     private final String ARTIFACTORY_URL = SERVER_URL + "artifactory/";
     private final String XRAY_URL = SERVER_URL + "xray/";
     private String testServerId;
@@ -135,12 +136,11 @@ public void testAddCliServerConfig_withUsernameAndPassword() {
 
     @Test
     public void testAddCliServerConfig_withAccessToken() {
-        String accessToken = UUID.randomUUID().toString();
         try {
-            jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, accessToken, tempDir);
+            jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, ACCESS_TOKEN, tempDir);
             JfrogCliServerConfig serverConfig = jfrogCliDriver.getServerConfig(tempDir, Collections.emptyList());
             assertNotNull(serverConfig);
-            assertEquals(serverConfig.getAccessToken(), accessToken);
+            assertEquals(serverConfig.getAccessToken(), ACCESS_TOKEN);
             assertEquals(serverConfig.getArtifactoryUrl(), ARTIFACTORY_URL);
             assertEquals(serverConfig.getXrayUrl(), XRAY_URL);
         } catch (IOException e) {