diff --git a/.gitignore b/.gitignore
index 297d032bb8..b5adde154c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ TestConfig
TKG
functional
!functional/security
+!functional/security/AQAvit
+!functional/security/Crypto
!functional/SyntheticGCWorkload
!functional/MBCS_Tests
diff --git a/functional/security/AQAvit/build.xml b/functional/security/AQAvit/build.xml
new file mode 100644
index 0000000000..e968de098e
--- /dev/null
+++ b/functional/security/AQAvit/build.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+ AQAvit Security Functional tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ant version is ${ant.version}
+ ============COMPILER SETTINGS============
+ ===fork: yes
+ ===executable: ${compiler.javac}
+ ===debug: on
+ ===destdir: ${DEST}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/functional/security/playlist.xml b/functional/security/AQAvit/playlist.xml
similarity index 100%
rename from functional/security/playlist.xml
rename to functional/security/AQAvit/playlist.xml
diff --git a/functional/security/src/net/adoptopenjdk/test/DefaultTlsFunctionalTest.java b/functional/security/AQAvit/src/net/adoptopenjdk/test/DefaultTlsFunctionalTest.java
similarity index 100%
rename from functional/security/src/net/adoptopenjdk/test/DefaultTlsFunctionalTest.java
rename to functional/security/AQAvit/src/net/adoptopenjdk/test/DefaultTlsFunctionalTest.java
diff --git a/functional/security/src/net/adoptopenjdk/test/Tls13FunctionalTest.java b/functional/security/AQAvit/src/net/adoptopenjdk/test/Tls13FunctionalTest.java
similarity index 100%
rename from functional/security/src/net/adoptopenjdk/test/Tls13FunctionalTest.java
rename to functional/security/AQAvit/src/net/adoptopenjdk/test/Tls13FunctionalTest.java
diff --git a/functional/security/testng.xml b/functional/security/AQAvit/testng.xml
similarity index 100%
rename from functional/security/testng.xml
rename to functional/security/AQAvit/testng.xml
diff --git a/functional/security/Crypto/build.xml b/functional/security/Crypto/build.xml
new file mode 100644
index 0000000000..c13fd15513
--- /dev/null
+++ b/functional/security/Crypto/build.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+ Crypto Security Functional tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ant version is ${ant.version}
+ ============COMPILER SETTINGS============
+ ===fork: yes
+ ===executable: ${compiler.javac}
+ ===debug: on
+ ===destdir: ${DEST}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/functional/security/Crypto/crypto.mk b/functional/security/Crypto/crypto.mk
new file mode 100644
index 0000000000..2b6569d441
--- /dev/null
+++ b/functional/security/Crypto/crypto.mk
@@ -0,0 +1,18 @@
+##############################################################################
+# 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.
+##############################################################################
+ifneq ($(JDK_VERSION),8)
+ JAVA_MOD_ARGS=--add-reads java.base=ALL-UNNAMED --add-exports java.base/com.sun.crypto.provider=ALL-UNNAMED --add-exports java.base/sun.security.internal.spec=ALL-UNNAMED --add-exports java.base/sun.security.ssl=ALL-UNNAMED --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-reads java.security.jgss=ALL-UNNAMED --add-exports java.security.jgss/sun.security.jgss=ALL-UNNAMED --add-exports java.security.jgss/sun.security.jgss.krb5=ALL-UNNAMED --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-reads java.xml.crypto=ALL-UNNAMED --add-exports java.xml.crypto/org.jcp.xml.dsig.internal.dom=ALL-UNNAMED --add-modules=jdk.crypto.ec --add-reads jdk.crypto.ec=ALL-UNNAMED --add-exports jdk.crypto.ec/sun.security.ec=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED
+else
+ JAVA_MOD_ARGS=
+endif
\ No newline at end of file
diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml
new file mode 100644
index 0000000000..0ab71cf4da
--- /dev/null
+++ b/functional/security/Crypto/playlist.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ crypto.mk
+
+ CryptoTests
+ $(JAVA_COMMAND) $(JVM_OPTIONS) $(JAVA_MOD_ARGS) -cp $(Q)$(RESOURCES_DIR)$(P)$(TEST_RESROOT)$(D)CryptoTests.jar$(P)$(TEST_RESROOT)$(D)test.jks$(Q) -Dcryptotests.skipAgentTests=1 cryptotest.CryptoTest; \
+ $(TEST_STATUS)
+
+ extended
+
+
+ functional
+
+
+
\ No newline at end of file
diff --git a/functional/security/build.xml b/functional/security/build.xml
index cd02f1af98..24fe837858 100644
--- a/functional/security/build.xml
+++ b/functional/security/build.xml
@@ -1,71 +1,40 @@
-
-
+
- Security Functional tests
-
+ Build security_Tests
+
-
-
+
-
-
-
-
-
-
- Ant version is ${ant.version}
- ============COMPILER SETTINGS============
- ===fork: yes
- ===executable: ${compiler.javac}
- ===debug: on
- ===destdir: ${DEST}
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-