diff --git a/functional/testHeadlessComponents/README.md b/functional/testHeadlessComponents/README.md
new file mode 100644
index 0000000000..0bfdcf6a44
--- /dev/null
+++ b/functional/testHeadlessComponents/README.md
@@ -0,0 +1,26 @@
+# TestHeadlessComponents Tests
+
+Test of correct behavior of swing components in a headless jre environment.
+
+## Running TestHeadlessComponents locally
+
+### Setting up the environment:
+Nothing special is required, just install the java package or unpack the portable you want the test.
+
+### ENV variables:
+The test utilizes *JAVA_HOME variable, so if it is not set it will not work correctly! In case of testing portable packages please set it up first.
+BOOTJDK_DIR - directory to store bootjdk which is used to compile the code in case we are testing jre only installation. Uses ~/bootjdk by default and uses Adoptium latest build of relevant jdk for this purpose.
+BOOTJDK_ARCHIVE_DIR - in case the user wants to use arbitrary jdk build, he can provide path to its archive and it will be used in jre execution. Creates $WORKSPACE/bootjdkarchive and downloads latest temurin archive if not set.
+WORKSPACE - directory where the testsuite is going to execute all the tests. ~/workspace by default
+TMPRESULTS - this is a location where the logfiles will be after the testsuite finishes. Same as WORKSPACE by default.
+*JREJDK - This tells the testsuite whether we are testing jre or jdk.
+ARCH - architecture of our system. The suite detects this automatically if left blank.
+*OJDK_VERSION_NUMBER - number of jdk we are testing - this is used for downloading corresponding JDK from adoptium site.
+
+Variables marked with "*" are mandatory and the testsuite wont run without them.
+
+### Executing the testsuite
+
+Now it is as simple as running bash script testHeadlessComponents.sh.
+
+
diff --git a/functional/testHeadlessComponents/build.xml b/functional/testHeadlessComponents/build.xml
new file mode 100644
index 0000000000..325cc9b562
--- /dev/null
+++ b/functional/testHeadlessComponents/build.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<!--
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+-->
+
+<project name="testHeadlessComponents" default="build" basedir=".">
+	<taskdef resource="net/sf/antcontrib/antlib.xml" />
+	<description>
+		Test of correct behavior of swing components in both headful and headless jre environment.
+	</description>
+	
+	<!-- set properties for this build -->
+	<property name="TEST" value="testHeadlessComponents" />
+	<property name="DEST" value="${BUILD_ROOT}/functional/testHeadlessComponents" />
+	<property name="src" location="./TestHeadlessComponents" />
+
+	<target name="THC.check">
+		<condition property="THCdir.exists">
+			<available file="TestHeadlessComponents" type="dir"/>
+		</condition>
+	</target>
+
+	<if>
+		<contains string="${SPEC}" substring="zos"/>
+		<then>
+			<property name="GIT_REPO" value="git@github.com:" />
+		</then>
+		<else>
+			<property name="GIT_REPO" value="https://github.com/" />
+		</else>
+	</if>
+
+	<target name="getTestHeadlessComponents" depends="THC.check" unless="THCdir.exists">
+		<exec executable="git" failonerror="true">
+			<arg value="clone" />
+			<arg value="${GIT_REPO}rh-openjdk/TestHeadlessComponents.git" />
+		</exec>
+	</target>
+
+	<target name="init">
+		<mkdir dir="${DEST}"/>
+        </target>
+
+
+	<target name="dist" depends="getTestHeadlessComponents" description="generate the distribution">
+		<copy todir="${DEST}">
+			<fileset dir="${src}" includes="*.xml, *.mk"/>
+		</copy>
+	</target>
+
+	<target name="build">
+		<antcall target="dist" inheritall="true" />
+	</target>
+</project>
diff --git a/functional/testHeadlessComponents/playlist.xml b/functional/testHeadlessComponents/playlist.xml
new file mode 100644
index 0000000000..b14253b025
--- /dev/null
+++ b/functional/testHeadlessComponents/playlist.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+-->
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
+	<test>
+		<testCaseName>TestHeadlessComponents</testCaseName>
+		<command> 
+			export OJDK_VERSION_NUMBER=$(JDK_VERSION) JREJDK="jdk" TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \
+			bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh; \
+			$(TEST_STATUS)
+		</command>
+		<levels>
+			<level>dev</level>
+		</levels>
+		<platformRequirementsList>
+			<platformRequirements>os.linux</platformRequirements>
+			<platformRequirements>os.win</platformRequirements>
+			<platformRequirements>os.osx</platformRequirements>
+		</platformRequirementsList>
+		<groups>
+			<group>functional</group>
+		</groups>
+	</test>
+</playlist>