diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 24a6798e4c0..5786f1ff710 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1224,6 +1224,9 @@ view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundar
 # Configures the maximum document length for rendering with kerning enabled
 #text.kerning.max_document_size=10000
 
+# Configure the initial zoom level for the GUI
+#gui.initialZoomScale=1
+
 #JMS options
 # Enable the following property to stop JMS Point-to-Point Sampler from using
 # the properties java.naming.security.[principal|credentials] when creating the queue connection
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
index df4a2adde5a..3cd08872daa 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
+++ b/src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
@@ -72,6 +72,8 @@ public object JMeterGuiLauncher {
     private fun setupLaF() {
         KerningOptimizer.INSTANCE.maxTextLengthWithKerning =
             JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
+        JMeterUIDefaults.INSTANCE.scale =
+            JMeterUtils.getPropDefault("gui.initialZoomScale", 1f)
         JMeterUIDefaults.INSTANCE.install()
         val jMeterLaf = LookAndFeelCommand.getPreferredLafCommand()
         try {
diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
index a551a5287f1..183570aad1a 100644
--- a/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
+++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
@@ -277,7 +277,7 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
          */
 
         long diff = parentElapsedTotal - sumSamplesTimes;
-        long maxDiff = nanoTime ? 10 : 16; // TimeMillis has granularity of 10-20
+        long maxDiff = nanoTime ? 10 : 1600; // TimeMillis has granularity of 10-20
         if (diff < 0 || diff > maxDiff) {
             Assertions.fail("ParentElapsed: " + parentElapsedTotal + " - " + " sum(samples): " + sumSamplesTimes
                     + " => " + diff + " not in [0," + maxDiff + "]; nanotime=" + nanoTime);