diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss
index 8448f57c4c..396fc803b7 100644
--- a/src/main/scss/abstracts/_theme.scss
+++ b/src/main/scss/abstracts/_theme.scss
@@ -138,7 +138,7 @@ $semantics: (
   --jenkins-border--subtle-shadow: 0 0 0 var(--jenkins-border-width)
     var(--jenkins-border-color--subtle);
 
-  @media (resolution <= 1x) {
+  @media (resolution <= 1dppx) {
     --jenkins-border-width: 2px;
   }
 
diff --git a/test/src/test/java/hudson/cli/ComputerStateTest.java b/test/src/test/java/hudson/cli/ComputerStateTest.java
index 56357db537..9072877b62 100644
--- a/test/src/test/java/hudson/cli/ComputerStateTest.java
+++ b/test/src/test/java/hudson/cli/ComputerStateTest.java
@@ -154,6 +154,9 @@ class ComputerStateTest {
 
         slave.toComputer().disconnect(null);
 
+        // Test fails sometimes because agent is not yet disconnected
+        // Wait 1 second for disconnect to complete
+        Thread.sleep(1009);
         HtmlPage page = wc.getPage(slave);
 
         assertLinkDoesNotExist(page, "Disconnect");
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index 18860506bb..a2a7d5e237 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -462,6 +462,13 @@ public class QueueTest {
         p.setAssignedLabel(label);
         p.scheduleBuild2(0);
 
+        // Wait 3 seconds if job is not already in the queue, reduce test flakes
+        if (!p.isInQueue()) {
+            Thread.sleep(3000);
+        }
+
+        assertTrue(p.isInQueue(), "Build not queued");
+
         JenkinsRule.WebClient webclient = r.createWebClient();
 
         XmlPage queueItems = webclient.goToXml("queue/api/xml");
diff --git a/test/src/test/java/hudson/model/RunTest.java b/test/src/test/java/hudson/model/RunTest.java
index 67b7910aa4..7e52408dbf 100644
--- a/test/src/test/java/hudson/model/RunTest.java
+++ b/test/src/test/java/hudson/model/RunTest.java
@@ -196,6 +196,9 @@ class RunTest  {
 
         // keeping the minimum to validate it's working and it's not exploitable as there are some modifications
         // like adding double quotes
+        // Some test flakes due to JavaScript objects not yet available
+        // Wait 2 seconds before checking the assertion
+        Thread.sleep(2003);
         ensureXssIsPrevented(up, "Down", "<img");
     }