diff --git a/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java
index 8bff0ba981..213fb7de28 100644
--- a/src/main/groovy/lang/MetaClassImpl.java
+++ b/src/main/groovy/lang/MetaClassImpl.java
@@ -3810,7 +3810,7 @@ public Object copy(Object value) {
         }
     };
 
-    class MethodIndex extends Index {
+    static class MethodIndex extends Index {
         public MethodIndex(boolean b) {
             super(false);
         }
diff --git a/src/main/groovy/ui/GroovySocketServer.java b/src/main/groovy/ui/GroovySocketServer.java
index 7d6a1e0acf..70e8623ee6 100644
--- a/src/main/groovy/ui/GroovySocketServer.java
+++ b/src/main/groovy/ui/GroovySocketServer.java
@@ -166,7 +166,7 @@ public void run() {
         }
     }
     
-    class GroovyClientConnection implements Runnable {
+    static class GroovyClientConnection implements Runnable {
         private Script script;
         private Socket socket;
         private BufferedReader reader;
diff --git a/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java b/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
index 6e3eaac030..8084cab8ad 100644
--- a/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
@@ -156,7 +156,7 @@ public void closeRange(Label end) {
         }
     }
 
-    private class ExceptionTableEntry {
+    private static class ExceptionTableEntry {
         Label start,end,goal;
         String sig;
     }
diff --git a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
index 712884f92b..ba5272b951 100644
--- a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
+++ b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
@@ -428,7 +428,7 @@ public void pushTemporaryTypeInfo() {
         context.pushTemporaryTypeInfo();
     }
 
-    private class TypeCheckingScope extends LinkedHashMap<String, Object> {
+    private static class TypeCheckingScope extends LinkedHashMap<String, Object> {
         private final AbstractTypeCheckingExtension.TypeCheckingScope parent;
 
         private TypeCheckingScope(final AbstractTypeCheckingExtension.TypeCheckingScope parentScope) {
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
index 63f7d03e9d..f6d68ea821 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
@@ -409,13 +409,13 @@ public void setUnwrapped(boolean unwrapped) {
         this.unwrapped = unwrapped;
     }
 
-    private class FindAction extends AbstractAction {
+    private static class FindAction extends AbstractAction {
         public void actionPerformed(ActionEvent ae) {
             FindReplaceUtility.showDialog();
         }
     }
 
-    private class ReplaceAction extends AbstractAction {
+    private static class ReplaceAction extends AbstractAction {
         public void actionPerformed(ActionEvent ae) {
             FindReplaceUtility.showDialog(true);
         }
@@ -477,7 +477,7 @@ public void actionPerformed(ActionEvent ae) {
     /**
      * Paint a horizontal line the width of a column and 1 pixel high
      */
-    private class OvertypeCaret extends DefaultCaret {
+    private static class OvertypeCaret extends DefaultCaret {
         //The overtype caret will simply be a horizontal line one pixel high
         // (once we determine where to paint it)
         public void paint(Graphics g) {
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
index 40d991fb44..7a30c02bda 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
@@ -174,7 +174,7 @@ public void undoableEditHappened(UndoableEditEvent uee) {
 
     }
 
-    private class StructuredEdit extends CompoundEdit {
+    private static class StructuredEdit extends CompoundEdit {
 
         private long editedTime;
 
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index 84769e0093..35ab50b1be 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -4477,7 +4477,7 @@ public void setEnableNamedQueries(boolean enableNamedQueries) {
     // command pattern implementation classes
     //-------------------------------------------------------------------------
 
-    private abstract class AbstractStatementCommand {
+    private abstract static class AbstractStatementCommand {
         /**
          * Execute the command that's defined by the subclass following
          * the Command pattern.  Specialized parameters are held in the command instances.
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
index 0617a42512..ccfea557cd 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
@@ -479,7 +479,7 @@ private Writer createWriter(final Writer out) {
         return configuration.isAutoIndent() && !(out instanceof DelegatingIndentWriter)?new DelegatingIndentWriter(out, configuration.getAutoIndentString()):out;
     }
 
-    private class TagData {
+    private static class TagData {
         private final Object[] array;
         private Map attributes;
         private Object body;
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
index ec07d1758b..9efa10977a 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
@@ -412,7 +412,7 @@ private void printEscaped(String s, boolean isAttributeValue) {
         }
     }
 
-    protected class NamespaceContext {
+    protected static class NamespaceContext {
         private final Map<String, String> namespaceMap;
 
         public NamespaceContext() {