diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e56e888646c..540ec2da638 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -99,3 +99,9 @@ jobs:
         path: |
           ${{ github.workspace }}/**/target/surefire-reports/*.xml
           ${{ github.workspace }}/**/hs_err_pid*.log
+    - name: Upload screenshots
+      if: always()
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: screenshots
+        path: tests/org.eclipse.swt.tests.win32/screenshots
diff --git a/binaries/pom.xml b/binaries/pom.xml
index 78946f0f1b8..3a07132562b 100644
--- a/binaries/pom.xml
+++ b/binaries/pom.xml
@@ -32,13 +32,13 @@
 	</properties>
 
 	<modules>
-		<module>org.eclipse.swt.cocoa.macosx.x86_64</module>
+		<!--<module>org.eclipse.swt.cocoa.macosx.x86_64</module>
 		<module>org.eclipse.swt.cocoa.macosx.aarch64</module>
 		<module>org.eclipse.swt.gtk.linux.aarch64</module>
 		<module>org.eclipse.swt.gtk.linux.ppc64le</module>
 		<module>org.eclipse.swt.gtk.linux.riscv64</module>
 		<module>org.eclipse.swt.gtk.linux.x86_64</module>
-		<module>org.eclipse.swt.win32.win32.aarch64</module>
+		<module>org.eclipse.swt.win32.win32.aarch64</module>-->
 		<module>org.eclipse.swt.win32.win32.x86_64</module>
 	</modules>
 
diff --git a/pom.xml b/pom.xml
index 89832b3b544..16d396ee011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,15 +183,15 @@
 
 
   <modules>
-    <module>bundles</module>
-    <module>binaries</module>
+    <module>bundles/org.eclipse.swt</module>
+    <module>binaries/org.eclipse.swt.win32.win32.x86_64</module>
     <module>local-build/org.eclipse.swt.fragments.localbuild</module>
-    <module>examples/org.eclipse.swt.examples</module>
+    <!--<module>examples/org.eclipse.swt.examples</module>
     <module>examples/org.eclipse.swt.examples.browser.demos</module>
     <module>examples/org.eclipse.swt.examples.launcher</module>
     <module>examples/org.eclipse.swt.examples.ole.win32</module>
-    <module>examples/org.eclipse.swt.examples.views</module>
-    <module>tests/org.eclipse.swt.tests</module>
-    <module>features/org.eclipse.swt.tools.feature</module>
+    <module>examples/org.eclipse.swt.examples.views</module>-->
+    <module>tests/org.eclipse.swt.tests.win32</module>
+    <!--<module>features/org.eclipse.swt.tools.feature</module>-->
   </modules>
 </project>
diff --git a/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/KeyboardLayoutTest.java b/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/KeyboardLayoutTest.java
index 92f03373964..380befe4622 100644
--- a/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/KeyboardLayoutTest.java	
+++ b/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/KeyboardLayoutTest.java	
@@ -15,9 +15,16 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.internal.win32.INPUT;
 import org.eclipse.swt.internal.win32.KEYBDINPUT;
 import org.eclipse.swt.internal.win32.OS;
@@ -221,9 +228,21 @@ public boolean isExtended() {
 	};
 
 	@BeforeEach
-	public void setUp(TestInfo testInfo) {
+	public void setUp(TestInfo testInfo) throws IOException {
 		this.testName = testInfo.getDisplayName();
 		display = new Display();
+		GC gc = new GC(display);
+		Image image = new Image(display, display.getBounds().width, display.getBounds().height);
+		gc.copyArea(image, 0, 0);
+		ImageLoader loader = new ImageLoader();
+		loader.data = new ImageData[]  {image.getImageData()  };
+		File folder = new File("screenshots");
+		if (!folder.exists()) {
+			Files.createDirectory(folder.toPath());
+		}
+		String filePath = folder.getAbsolutePath();
+		loader.save(filePath + "/" + testName + ".png", SWT.IMAGE_PNG);
+
 		shell = new Shell();
 
 		Listener listener = event -> {
diff --git a/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/Test_org_eclipse_swt_events_KeyEvent.java b/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/Test_org_eclipse_swt_events_KeyEvent.java
index 26c0a5406c3..cbfa278a454 100644
--- a/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/Test_org_eclipse_swt_events_KeyEvent.java	
+++ b/tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/Test_org_eclipse_swt_events_KeyEvent.java	
@@ -18,7 +18,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.events.KeyEvent
@@ -26,7 +25,6 @@
  * @see org.eclipse.swt.events.KeyEvent
  */
 @SuppressWarnings("restriction")
-@DisabledIfEnvironmentVariable(named = "GITHUB_ACTIONS", matches = "true", disabledReason = "Windows Server 2025 incompatibility: https://github.com/eclipse-platform/eclipse.platform.swt/issues/2516")
 public class Test_org_eclipse_swt_events_KeyEvent extends KeyboardLayoutTest {
 	// Windows layouts suitable for 'LoadKeyboardLayout()', obtained from 'GetKeyboardLayoutName()'
 	static char[] LAYOUT_BENGALI        = "00020445\0".toCharArray();