diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 1081c7450795..7fd987f901e8 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -803,3 +803,251 @@ jdk_core_no_security = \
 # Set of tests for `@since` checks in source code documentation
 jdk_since_checks = \
    tools/sincechecker/modules/java_base/CheckSince_javaBase.java
+
+# Wayland tests to be executed with -Dawt.toolkit.name=WLToolkit
+jdk_awt_wayland = \
+    :jdk_awt \
+    -com/apple/eawt \
+    -com/apple/laf \
+    -sun/awt \
+    -java/awt/a11y \
+    -java/awt/applet \
+    -java/awt/BasicStroke/DashOffset.java \
+    -java/awt/BasicStroke/DashScaleMinWidth.java \
+    -java/awt/BasicStroke/DashZeroWidth.java \
+    -java/awt/BorderLayout \
+    -java/awt/Button \
+    -java/awt/Checkbox \
+    -java/awt/Choice \
+    -java/awt/Clipboard \
+    -java/awt/ColorClass/AlphaColorTest.java \
+    -java/awt/Component/7097771 \
+    -java/awt/Component/CompEventOnHiddenComponent \
+    -java/awt/Component/ComponentRedrawnTest.java \
+    -java/awt/Component/CreateImage \
+    -java/awt/Component/DimensionEncapsulation \
+    -java/awt/Component/F10TopToplevel \
+    -java/awt/Component/GetListenersTest.java \
+    -java/awt/Component/GetScreenLocTest \
+    -java/awt/Component/InsetsEncapsulation \
+    -java/awt/Component/isLightweightCrash \
+    -java/awt/Component/NativeInLightShow \
+    -java/awt/Component/NoUpdateUponShow \
+    -java/awt/Component/PaintAll \
+    -java/awt/Component/PrintAllXcheckJNI \
+    -java/awt/Component/RepaintTest.java \
+    -java/awt/Component/Revalidate \
+    -java/awt/Component/SetComponentsBounds \
+    -java/awt/Component/SetEnabledPerformance \
+    -java/awt/Component/TreeLockDeadlock \
+    -java/awt/Component/UpdatingBootTime \
+    -java/awt/Component/Validate \
+    -java/awt/ComponentOrientation \
+    -java/awt/Container \
+    -java/awt/Cursor \
+    -java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java \
+    -java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java \
+    -java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java \
+    -java/awt/datatransfer/CustomClassLoaderTransferTest/CustomClassLoaderTransferTest.java \
+    -java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java \
+    -java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java \
+    -java/awt/datatransfer/HTMLDataFlavors/ManualHTMLDataFlavorTest.html \
+    -java/awt/datatransfer/ImageTransfer/ImageTransferTest.java \
+    -java/awt/datatransfer/Independence/IndependenceAWTTest.java \
+    -java/awt/datatransfer/Independence/IndependenceSwingTest.java \
+    -java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java \
+    -java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java \
+    -java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java \
+    -java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java \
+    -java/awt/Debug \
+    -java/awt/Desktop \
+    -java/awt/Dialog \
+    -java/awt/dnd \
+    -java/awt/EmbeddedFrame \
+    -java/awt/event \
+    -java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java \
+    -java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java \
+    -java/awt/EventDispatchThread/PropertyPermissionOnEDT/PropertyPermissionOnEDT.java \
+    -java/awt/EventQueue/6980209/bug6980209.java \
+    -java/awt/FileDialog \
+    -java/awt/FlowLayout \
+    -java/awt/Focus/6378278 \
+    -java/awt/Focus/6382144 \
+    -java/awt/Focus/6401036 \
+    -java/awt/Focus/6981400 \
+    -java/awt/Focus/8000326 \
+    -java/awt/Focus/8013611 \
+    -java/awt/Focus/8073453 \
+    -java/awt/Focus/8282640 \
+    -java/awt/Focus/ActualFocusedWindowTest \
+    -java/awt/Focus/AppletInitialFocusTest \
+    -java/awt/Focus/AsyncUpFocusCycleTest.java \
+    -java/awt/Focus/AutoRequestFocusTest \
+    -java/awt/Focus/Cause \
+    -java/awt/Focus/ChildWindowFocusTest \
+    -java/awt/Focus/ChoiceFocus \
+    -java/awt/Focus/ClearGlobalFocusOwnerTest \
+    -java/awt/Focus/ClearLwQueueBreakTest \
+    -java/awt/Focus/ClearMostRecentFocusOwnerTest.java \
+    -java/awt/Focus/CloseDialogActivateOwnerTest \
+    -java/awt/Focus/ConsumedTabKeyTest.java \
+    -java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest \
+    -java/awt/Focus/ContainerFocusAutoTransferTest \
+    -java/awt/Focus/DeiconifiedFrameLoosesFocus \
+    -java/awt/Focus/DisposedWindow \
+    -java/awt/Focus/EventRetargetTest.java \
+    -java/awt/Focus/ExtraPropChangeNotifVetoingTest.java \
+    -java/awt/Focus/FocusEmbeddedFrameTest \
+    -java/awt/Focus/FocusForRemovedComponentTest.java \
+    -java/awt/Focus/FocusOwnerFrameOnClick \
+    -java/awt/Focus/FocusSubRequestTest \
+    -java/awt/Focus/FocusTransitionTest \
+    -java/awt/Focus/FocusTraversalPolicy \
+    -java/awt/Focus/FocusTraversalPolicyIAE.java \
+    -java/awt/Focus/FrameJumpingToMouse \
+    -java/awt/Focus/FrameMinimizeTest \
+    -java/awt/Focus/IconifiedFrameFocusChangeTest \
+    -java/awt/Focus/InitialFocusTest.java \
+    -java/awt/Focus/InputVerifierTest3 \
+    -java/awt/Focus/KeyEventForBadFocusOwnerTest \
+    -java/awt/Focus/LabelScrollBarFocus.java \
+    -java/awt/Focus/ModalBlockedStealsFocusTest \
+    -java/awt/Focus/ModalDialogActivationTest \
+    -java/awt/Focus/ModalDialogInFocusEventTest.java \
+    -java/awt/Focus/ModalDialogInitialFocusTest \
+    -java/awt/Focus/ModalExcludedWindowClickTest \
+    -java/awt/Focus/MouseClickRequestFocusRaceTest \
+    -java/awt/Focus/NoAutotransferToDisabledCompTest \
+    -java/awt/Focus/NoFocusOwnerAWTTest.java \
+    -java/awt/Focus/NoFocusOwnerSwingTest.java \
+    -java/awt/Focus/NonFocusableBlockedOwnerTest \
+    -java/awt/Focus/NonFocusableResizableTooSmall \
+    -java/awt/Focus/NonFocusableWindowTest \
+    -java/awt/Focus/NullActiveWindowOnFocusLost \
+    -java/awt/Focus/OwnedWindowFocusIMECrashTest \
+    -java/awt/Focus/QuickTypeTest.java \
+    -java/awt/Focus/RemoveAfterRequest \
+    -java/awt/Focus/RequestFocusAndHideTest \
+    -java/awt/Focus/RequestFocusByCause \
+    -java/awt/Focus/RequestFocusToDisabledCompTest \
+    -java/awt/Focus/RequestOnCompWithNullParent \
+    -java/awt/Focus/ResetMostRecentFocusOwnerTest \
+    -java/awt/Focus/RestoreFocusInfiniteLoopTest.java \
+    -java/awt/Focus/RestoreFocusOnDisabledComponentTest \
+    -java/awt/Focus/RollbackFocusFromAnotherWindowTest \
+    -java/awt/Focus/RowToleranceTransitivityTest.java \
+    -java/awt/Focus/SequencedLightweightRequestsTest.java \
+    -java/awt/Focus/SetFocusableTest.java \
+    -java/awt/Focus/ShowFrameCheckForegroundTest \
+    -java/awt/Focus/SimpleWindowActivationTest \
+    -java/awt/Focus/SortingFPT \
+    -java/awt/Focus/TemporaryLostComponentDeadlock.java \
+    -java/awt/Focus/ToFrontFocusTest \
+    -java/awt/Focus/TranserFocusToWindow \
+    -java/awt/Focus/TraversalKeysPropertyNamesTest.java \
+    -java/awt/Focus/TypeAhead \
+    -java/awt/Focus/UnaccessibleChoice \
+    -java/awt/Focus/UpFocusCycleTest.java \
+    -java/awt/Focus/VetoableChangeListenerLoopTest.java \
+    -java/awt/Focus/WindowInitialFocusTest \
+    -java/awt/Focus/WindowIsFocusableAccessByThreadsTest \
+    -java/awt/Focus/WindowUpdateFocusabilityTest \
+    -java/awt/Focus/WrongKeyTypedConsumedTest \
+    -java/awt/font/TextLayout/MyanmarTextTest.java \
+    -java/awt/font/TextLayout/TestJustification.html \
+    -java/awt/font/TextLayout/TestOldHangul.java \
+    -java/awt/font/TextLayout/TestTibetan.java \
+    -java/awt/font/TextLayout/TestVS.java \
+    -java/awt/font/TextLayout/VariationSelectorTest.java \
+    -java/awt/FontClass/FontAccess.java \
+    -java/awt/Frame \
+    -java/awt/FullScreen/8013581 \
+    -java/awt/FullScreen/AllFramesMaximize \
+    -java/awt/FullScreen/AltTabCrashTest \
+    -java/awt/FullScreen/BufferStrategyExceptionTest \
+    -java/awt/FullScreen/FullScreenInsets \
+    -java/awt/FullScreen/FullscreenWindowProps \
+    -java/awt/FullScreen/TranslucentWindow \
+    -java/awt/grab \
+    -java/awt/Graphics/DrawOvalTest.java \
+    -java/awt/Graphics/LCDTextAndGraphicsState.java \
+    -java/awt/Graphics/TextAAHintsTest.java \
+    -java/awt/Graphics/XORPaint.java \
+    -java/awt/Graphics2D/CopyAreaOOB.java \
+    -java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java \
+    -java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java \
+    -java/awt/GridBagLayout \
+    -java/awt/GridLayout \
+    -java/awt/Gtk \
+    -java/awt/hidpi \
+    -java/awt/Icon \
+    -java/awt/im \
+    -java/awt/image/BufferStrategy/ExceptionAfterComponentDispose.java \
+    -java/awt/image/MemoryLeakTest/MemoryLeakTest.java \
+    -java/awt/image/OpaquePNGToGIFTest.java \
+    -java/awt/image/VolatileImage/DrawBufImgOp.java \
+    -java/awt/image/VolatileImage/TransparentVImage.java \
+    -java/awt/image/mlib/MlibOpsTest.java \
+    -java/awt/image/multiresolution/MenuMultiresolutionIconTest.java \
+    -java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java \
+    -java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java \
+    -java/awt/image/multiresolution/MultiresolutionIconTest.java \
+    -java/awt/Insets/CombinedTestApp1.java \
+    -java/awt/Insets/RemoveMenuBarTest.java \
+    -java/awt/InputMethods \
+    -java/awt/JAWT \
+    -java/awt/keyboard \
+    -java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest \
+    -java/awt/KeyboardFocusmanager/TypeAhead \
+    -java/awt/Label \
+    -java/awt/Layout \
+    -java/awt/LightweightComponent \
+    -java/awt/LightweightDispatcher \
+    -java/awt/List \
+    -java/awt/Menu \
+    -java/awt/MenuBar \
+    -java/awt/MenuItem \
+    -java/awt/Mixing \
+    -java/awt/Modal \
+    -java/awt/Mouse \
+    -java/awt/MouseAdapter \
+    -java/awt/MouseInfo \
+    -java/awt/MultipleGradientPaint \
+    -java/awt/Multiscreen/MouseEventTest/MouseEventTest.java \
+    -java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java \
+    -java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java \
+    -java/awt/Paint/bug8024864.java \
+    -java/awt/Paint/ButtonRepaint.java \
+    -java/awt/Paint/CheckboxRepaint.java \
+    -java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest \
+    -java/awt/Paint/ExposeOnEDT.java \
+    -java/awt/Paint/LabelRepaint.java \
+    -java/awt/Paint/ListRepaint.java \
+    -java/awt/Paint/PaintNativeOnUpdate.java \
+    -java/awt/Panel \
+    -java/awt/PopupMenu \
+    -java/awt/print \
+    -java/awt/PrintJob \
+    -java/awt/Robot \
+    -java/awt/Scrollbar \
+    -java/awt/ScrollPane \
+    -java/awt/security \
+    -java/awt/SplashScreen \
+    -java/awt/TextArea \
+    -java/awt/TextComponent \
+    -java/awt/TextField \
+    -java/awt/Toolkit/BadDisplayTest/BadDisplayTest.java \
+    -java/awt/Toolkit/DesktopProperties/rfe4758438.java \
+    -java/awt/Toolkit/DynamicLayout/bug7172833.java \
+    -java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java \
+    -java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh \
+    -java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java \
+    -java/awt/Toolkit/RealSync/Test.java \
+    -java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java \
+    -java/awt/Toolkit/SecurityTest/SecurityTest2.java \
+    -java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java \
+    -java/awt/TrayIcon \
+    -java/awt/wakefield \
+    -java/awt/Window \
+    -java/awt/WMSpecificTests \
+    -java/awt/xembed