diff --git a/dist/index.js b/dist/index.js
index 1c92eba..e3387f8 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2954,7 +2954,7 @@ function run() {
             const target = core.getInput('target', { required: false });
             const customTarget = core.getInput('custom_target', { required: false });
             const aqatestsRepo = core.getInput('aqa-testsRepo', { required: false });
-            const aqasystemtestsRepo = core.getInput('aqa-systemtestsRepo', {required: false});
+            const aqasystemtestsRepo = core.getInput('aqa-systemtestsRepo', { required: false });
             const openj9Repo = core.getInput('openj9_repo', { required: false });
             const tkgRepo = core.getInput('tkg_Repo', { required: false });
             const vendorTestRepos = core.getInput('vendor_testRepos', { required: false });
@@ -3402,7 +3402,6 @@ function runaqaTest(version, jdksource, buildList, target, customTarget, aqatest
         if (!('TEST_JDK_HOME' in process.env))
             process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource);
         yield getAqaTestsRepo(aqatestsRepo);
-        
         yield runGetSh(tkgRepo, openj9Repo, vendorTestParams);
         //Get Dependencies, using /*zip*/dependents.zip to avoid loop every available files
         let dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/test.getDependency/lastSuccessfulBuild/artifact//*zip*/dependents.zip');
@@ -3413,7 +3412,9 @@ function runaqaTest(version, jdksource, buildList, target, customTarget, aqatest
         // Test.dependency only has one level of archive directory, none of actions toolkit support mv files by regex. Using 7zip discards the directory directly
         yield exec.exec(`${sevenzexe} e ${dependents} -o${process.env.GITHUB_WORKSPACE}/aqa-tests/TKG/lib`);
         if (buildList.includes('system')) {
-            getAqaSystemTestsRepo(aqasystemtestsRepo);
+            if (aqasystemtestsRepo && aqasystemtestsRepo.length !== 0) {
+                getAqaSystemTestsRepo(aqasystemtestsRepo);
+            }
             dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/systemtest.getDependency/lastSuccessfulBuild/artifact/*zip*/dependents.zip');
             // System.dependency has different levels of archive structures archive/systemtest_prereqs/*.*
             // None of io.mv, io.cp and exec.exec can mv directories as expected (mv archive/ ./). Move subfolder systemtest_prereqs instead.
@@ -3562,16 +3563,11 @@ function getAqaTestsRepo(aqatestsRepo) {
         process.chdir('aqa-tests');
     });
 }
-
 function getAqaSystemTestsRepo(aqasystemtestsRepo) {
-  let repoBranch = ['adoptium/aqa-systemtests', 'master'];
-  if (aqasystemtestsRepo.length !== 0) {
-      repoBranch = parseRepoBranch(aqasystemtestsRepo);
-  }
-  process.env.ADOPTOPENJDK_SYSTEMTEST_REPO = repoBranch[0];
-  process.env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = repoBranch[1];
+    const repoBranch = parseRepoBranch(aqasystemtestsRepo);
+    process.env.ADOPTOPENJDK_SYSTEMTEST_REPO = repoBranch[0];
+    process.env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = repoBranch[1];
 }
-
 function runGetSh(tkgRepo, openj9Repo, vendorTestParams) {
     return __awaiter(this, void 0, void 0, function* () {
         let parameters = '';
diff --git a/src/aqa.ts b/src/aqa.ts
index 8c005de..3da6256 100644
--- a/src/aqa.ts
+++ b/src/aqa.ts
@@ -9,7 +9,9 @@ async function run(): Promise<void> {
     const target = core.getInput('target', {required: false})
     const customTarget = core.getInput('custom_target', {required: false})
     const aqatestsRepo = core.getInput('aqa-testsRepo', {required: false})
-    const aqasystemtestsRepo = core.getInput('aqa-systemtestsRepo', {required: false})
+    const aqasystemtestsRepo = core.getInput('aqa-systemtestsRepo', {
+      required: false
+    })
     const openj9Repo = core.getInput('openj9_repo', {required: false})
     const tkgRepo = core.getInput('tkg_Repo', {required: false})
     const vendorTestRepos = core.getInput('vendor_testRepos', {required: false})
@@ -69,7 +71,7 @@ async function run(): Promise<void> {
       openj9Repo,
       tkgRepo,
       vendorTestParams,
-      aqasystemtestsRepo,
+      aqasystemtestsRepo
     )
   } catch (error) {
     core.setFailed(error.message)
diff --git a/src/runaqa.ts b/src/runaqa.ts
index 81d1fd2..18a1df4 100644
--- a/src/runaqa.ts
+++ b/src/runaqa.ts
@@ -33,7 +33,7 @@ export async function runaqaTest(
   openj9Repo: string,
   tkgRepo: string,
   vendorTestParams: string,
-  aqasystemtestsRepo: string,
+  aqasystemtestsRepo: string
 ): Promise<void> {
   await installDependencyAndSetup()
   setSpec()
@@ -60,8 +60,8 @@ export async function runaqaTest(
   )
 
   if (buildList.includes('system')) {
-    if (aqa-systemtestsRepo && aqa-systemtestsRepo.length !== 0) {
-    getAqaSystemTestsRepo(aqasystemtestsRepo);
+    if (aqasystemtestsRepo && aqasystemtestsRepo.length !== 0) {
+      getAqaSystemTestsRepo(aqasystemtestsRepo)
     }
     dependents = await tc.downloadTool(
       'https://ci.adoptopenjdk.net/view/all/job/systemtest.getDependency/lastSuccessfulBuild/artifact/*zip*/dependents.zip'
@@ -233,10 +233,10 @@ async function getAqaTestsRepo(aqatestsRepo: string): Promise<void> {
   process.chdir('aqa-tests')
 }
 
-function getAqaSystemTestsRepo(aqasystemtestsRepo: string) {
+function getAqaSystemTestsRepo(aqasystemtestsRepo: string): void {
   const repoBranch = parseRepoBranch(aqasystemtestsRepo)
-  process.env.ADOPTOPENJDK_SYSTEMTEST_REPO = repoBranch[0];
-  process.env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = repoBranch[1];
+  process.env.ADOPTOPENJDK_SYSTEMTEST_REPO = repoBranch[0]
+  process.env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = repoBranch[1]
 }
 
 async function runGetSh(