diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml
index 325cc9b562..1a3b995eb0 100644
--- a/functional/testHeadlessComponents/build.xml
+++ b/functional/testHeadlessComponents/build.xml
@@ -45,6 +45,7 @@
 		<exec executable="git" failonerror="true">
 			<arg value="clone" />
 			<arg value="${GIT_REPO}rh-openjdk/TestHeadlessComponents.git" />
+			<arg value="--recurse-submodules"/>
 		</exec>
 	</target>
 
diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml
index c22aa7a73d..90024d5236 100644
--- a/functional/testHeadlessComponents/playlist.xml
+++ b/functional/testHeadlessComponents/playlist.xml
@@ -15,41 +15,19 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>TestHeadlessComponents</testCaseName>
-		<disables>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/5224</comment>
-				<impl>openj9</impl>
-			</disable>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/5224</comment>
-				<impl>ibm</impl>
-			</disable>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/6647#issuecomment-3382932623</comment>
-				<platform>aarch64_mac</platform>
-				<impl>hotspot</impl>
-			</disable>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/pull/6648#issuecomment-3397002761</comment>
-				<platform>x86-64_windows</platform>
-				<impl>hotspot</impl>
-				<version>8</version>
-			</disable>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/5775</comment>
-				<platform>x86-64_mac</platform>
-				<impl>hotspot</impl>
-				<version>8</version>
-			</disable>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/pull/6616#issuecomment-3323705754</comment>
-				<platform>x86-64_mac</platform>
-				<impl>hotspot</impl>
-				<version>25</version>
-			</disable>
-		</disables>
-		<command>
-			export OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK="jdk" TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \
+                <disables>
+                    <disable>
+                        <comment>https://github.com/adoptium/aqa-tests/issues/5224</comment>
+                            <impl>openj9</impl>
+                        </disable>
+                        <disable>
+                            <comment>https://github.com/adoptium/aqa-tests/issues/5224</comment>
+                            <impl>ibm</impl>
+                        </disable>
+                </disables>
+                <command>
+			case "$(USE_JRE)" in true) JREJDK=jre ;; *) JREJDK=jdk ;; esac; \
+			export JAVA_TO_TEST=$(JAVA_TO_TEST) OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \
 			bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \
 			$(TEST_STATUS)
 		</command>