diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index f884ea0789..f09f1c30ec 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -95,7 +95,6 @@
 			<arg value="-f"/>
 			<arg value="${repo_sha}"/>
 		</exec>
-		<checkGitRepoSha repoDir="OpenJCEPlus" />
 		<addTestenvProperties repoDir="OpenJCEPlus" repoName="OpenJCEPlus"/>
 
 		<delete dir="./OpenJCEPlus/src/main" />
diff --git a/functional/security/Crypto/build.xml b/functional/security/Crypto/build.xml
index 603c8306a3..2066875be6 100644
--- a/functional/security/Crypto/build.xml
+++ b/functional/security/Crypto/build.xml
@@ -43,7 +43,6 @@
 	</if>
 	<target name="getCryptoTest" depends="cryptoTest.check" unless="cryptoTestdir.exists">
 		<getFileWithRetry file="CryptoTest" command="git clone --depth 1 -q ${GIT_REPO}rh-openjdk/CryptoTest.git -b master CryptoTest"/>
-		<checkGitRepoSha repoDir="CryptoTest"/>
 	</target>
 	
 	<target name="init">
diff --git a/get.sh b/get.sh
index 90b95f251b..a14927882a 100755
--- a/get.sh
+++ b/get.sh
@@ -570,7 +570,6 @@ getTestKitGen()
 	echo "git checkout -q -f $tkg_sha"
 	git checkout -q -f $tkg_sha
 
-	checkTestRepoSHAs
 }
 
 getCustomJtreg()
@@ -808,30 +807,15 @@ testJavaVersion()
 
 checkRepoSHA()
 {
-	sha_file="$TESTDIR/TKG/SHA.txt"
-	testenv_file="$TESTDIR/testenv/testenv.properties"
-
-	echo "$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file"
-	$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file
+	sha_file="$TESTDIR/TKG/SHAs.txt"
+	echo "$TESTDIR/TKG/scripts/getSHAs.sh --repo_dir $1 --output_file $sha_file"
+	$TESTDIR/TKG/scripts/getSHAs.sh --test_root_dir $1 --shas_file $sha_file
 
+	testenv_file="$TESTDIR/testenv/testenv.properties"
 	echo "$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2"
 	$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
 }
 
-checkTestRepoSHAs()
-{
-	echo "check adoptium repo and TKG repo SHA"
-
-	output_file="$TESTDIR/TKG/SHA.txt"
-	if [ -e ${output_file} ]; then
-		echo "rm $output_file"
-		rm ${output_file}
-	fi
-
-	checkRepoSHA "$TESTDIR" "ADOPTOPENJDK"
-	checkRepoSHA "$TESTDIR/TKG" "TKG"
-}
-
 checkOpenJ9RepoSHA()
 {
 	echo "check OpenJ9 Repo sha"
diff --git a/openjdk/build.xml b/openjdk/build.xml
index 66703c0e97..4f83a4f101 100755
--- a/openjdk/build.xml
+++ b/openjdk/build.xml
@@ -232,7 +232,6 @@
 				</if>
 			</else>
 		</if>
-		<checkGitRepoSha repoDir="openjdk-jdk"/>
 		<addTestenvProperties repoDir="openjdk-jdk" repoName="JDK${env.JDK_VERSION}"/>
 	</target>
 
diff --git a/system/common.xml b/system/common.xml
index 2dc220e63c..54f406ac83 100644
--- a/system/common.xml
+++ b/system/common.xml
@@ -112,7 +112,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/STF" />
 		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/STF" repoName="STF"/>
 	</target>
 	<target name="clone_systemtest">
@@ -181,7 +180,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" />
  		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" repoName="AQA_SYSTEMTEST" />
 	</target>
 
@@ -251,7 +249,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" />
  		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" repoName="OPENJ9_SYSTEMTEST"/>
 	</target>