diff --git a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
index 16c024d2e360286015a7dfc258c6e1826e261193..bb2a946e4c27499592e9bd909f8059a2780fd4c0 100644
--- a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
+++ b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java
@@ -46,6 +46,12 @@ import java.util.*;
  * @author Kohsuke Kawaguchi
  */
 public class NoOverlapCategoryAxis extends CategoryAxis {
+
+    /**
+     * Minimum distance between labels.
+     */
+    private static final double MIN_DISTANCE = 6.0;
+
     public NoOverlapCategoryAxis(String label) {
         super(label);
     }
@@ -140,6 +146,11 @@ public class NoOverlapCategoryAxis extends CategoryAxis {
                         }
                     }
                     r = bounds.getBounds2D();
+                    // add margins in all directions
+                    r.add(r.getMaxX() + MIN_DISTANCE, r.getCenterY());
+                    r.add(r.getMinX() - MIN_DISTANCE, r.getCenterY());
+                    r.add(r.getCenterX(), r.getMinY() - MIN_DISTANCE);
+                    r.add(r.getCenterX(), r.getMaxX() + MIN_DISTANCE);
                 }
 
                 categoryIndex++;