diff --git a/gradle.properties b/gradle.properties
index 2addc6098cc..58b78973d81 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 checkstyleMainMaxWarnings=5409
-checkstyleTestMaxWarnings=286
+checkstyleTestMaxWarnings=269
diff --git a/src/test/java/games/strategy/engine/chat/ChatTest.java b/src/test/java/games/strategy/engine/chat/ChatTest.java
index 5775a2beb0a..4363749bd46 100644
--- a/src/test/java/games/strategy/engine/chat/ChatTest.java
+++ b/src/test/java/games/strategy/engine/chat/ChatTest.java
@@ -185,37 +185,36 @@ public void run() {
     }
     assertEquals(m_serverChatListener.m_players.size(), 0);
   }
-}
 
+  private static class TestChatListener implements IChatListener {
+    public List<INode> m_players;
+    public List<String> m_messages = new ArrayList<>();
+    public List<Boolean> m_thirdPerson = new ArrayList<>();
+    public List<String> m_from = new ArrayList<>();
 
-class TestChatListener implements IChatListener {
-  public List<INode> m_players;
-  public List<String> m_messages = new ArrayList<>();
-  public List<Boolean> m_thirdPerson = new ArrayList<>();
-  public List<String> m_from = new ArrayList<>();
+    @Override
+    public void updatePlayerList(final Collection<INode> players) {
+      synchronized (this) {
+        m_players = new ArrayList<>(players);
+      }
+    }
 
-  @Override
-  public void updatePlayerList(final Collection<INode> players) {
-    synchronized (this) {
-      m_players = new ArrayList<>(players);
+    @Override
+    public void addMessageWithSound(final String message, final String from, final boolean thirdperson,
+        final String sound) {
+      synchronized (this) {
+        m_messages.add(message);
+        m_thirdPerson.add(thirdperson);
+        m_from.add(from);
+      }
     }
-  }
 
-  @Override
-  public void addMessageWithSound(final String message, final String from, final boolean thirdperson,
-      final String sound) {
-    synchronized (this) {
-      m_messages.add(message);
-      m_thirdPerson.add(thirdperson);
-      m_from.add(from);
+    @Override
+    public void addMessage(final String message, final String from, final boolean thirdperson) {
+      addMessageWithSound(message, from, thirdperson, SoundPath.CLIP_CHAT_MESSAGE);
     }
-  }
 
-  @Override
-  public void addMessage(final String message, final String from, final boolean thirdperson) {
-    addMessageWithSound(message, from, thirdperson, SoundPath.CLIP_CHAT_MESSAGE);
+    @Override
+    public void addStatusMessage(final String message) {}
   }
-
-  @Override
-  public void addStatusMessage(final String message) {}
 }
diff --git a/src/test/java/games/strategy/engine/lobby/server/ModeratorControllerTest.java b/src/test/java/games/strategy/engine/lobby/server/ModeratorControllerTest.java
index de5f2050364..32e1589a2c6 100644
--- a/src/test/java/games/strategy/engine/lobby/server/ModeratorControllerTest.java
+++ b/src/test/java/games/strategy/engine/lobby/server/ModeratorControllerTest.java
@@ -58,7 +58,7 @@ public Void answer(final InvocationOnMock invocation) throws Throwable {
     m_controller.boot(booted);
     assertTrue(m_listener.getRemoved().contains(booted));
   }
-  
+
   @Test
   public void testCantResetAdminPassword() throws UnknownHostException {
     MessageContext.setSenderNodeForThread(m_adminNode);
@@ -77,21 +77,20 @@ public void testAssertAdmin() throws UnknownHostException {
     MessageContext.setSenderNodeForThread(m_adminNode);
     assertTrue(m_controller.isAdmin());
   }
-}
 
+  private static class ConnectionChangeListener implements IConnectionChangeListener {
+    final List<INode> m_removed = new ArrayList<>();
 
-class ConnectionChangeListener implements IConnectionChangeListener {
-  final List<INode> m_removed = new ArrayList<>();
+    @Override
+    public void connectionAdded(final INode to) {}
 
-  @Override
-  public void connectionAdded(final INode to) {}
-
-  @Override
-  public void connectionRemoved(final INode to) {
-    m_removed.add(to);
-  }
+    @Override
+    public void connectionRemoved(final INode to) {
+      m_removed.add(to);
+    }
 
-  public List<INode> getRemoved() {
-    return m_removed;
+    public List<INode> getRemoved() {
+      return m_removed;
+    }
   }
 }
diff --git a/src/test/java/games/strategy/engine/message/unifiedmessenger/ChannelMessengerTest.java b/src/test/java/games/strategy/engine/message/unifiedmessenger/ChannelMessengerTest.java
index 8788cbdce59..5e7eeb2c6b4 100644
--- a/src/test/java/games/strategy/engine/message/unifiedmessenger/ChannelMessengerTest.java
+++ b/src/test/java/games/strategy/engine/message/unifiedmessenger/ChannelMessengerTest.java
@@ -142,49 +142,47 @@ private static void assertCallCountIs(final ChannelSubscribor subscribor, final
     }
     assertEquals(expected, subscribor.getCallCount());
   }
-}
-
 
-interface IChannelBase extends IChannelSubscribor {
-  void testNoParams();
+  private interface IChannelBase extends IChannelSubscribor {
+    void testNoParams();
 
-  void testPrimitives(int a, short b, long c, byte d, boolean e, float f);
+    void testPrimitives(int a, short b, long c, byte d, boolean e, float f);
 
-  void testString(String a);
-
-  void testArray(int[] ints, short[] shorts, byte[] bytes, boolean[] bools, float[] floats, Object[] objects);
-}
+    void testString(String a);
 
+    void testArray(int[] ints, short[] shorts, byte[] bytes, boolean[] bools, float[] floats, Object[] objects);
+  }
 
-class ChannelSubscribor implements IChannelBase {
-  private int m_callCount = 0;
+  private static class ChannelSubscribor implements IChannelBase {
+    private int m_callCount = 0;
 
-  private synchronized void incrementCount() {
-    m_callCount++;
-  }
+    private synchronized void incrementCount() {
+      m_callCount++;
+    }
 
-  public synchronized int getCallCount() {
-    return m_callCount;
-  }
+    public synchronized int getCallCount() {
+      return m_callCount;
+    }
 
-  @Override
-  public void testNoParams() {
-    incrementCount();
-  }
+    @Override
+    public void testNoParams() {
+      incrementCount();
+    }
 
-  @Override
-  public void testPrimitives(final int a, final short b, final long c, final byte d, final boolean e, final float f) {
-    incrementCount();
-  }
+    @Override
+    public void testPrimitives(final int a, final short b, final long c, final byte d, final boolean e, final float f) {
+      incrementCount();
+    }
 
-  @Override
-  public void testString(final String a) {
-    incrementCount();
-  }
+    @Override
+    public void testString(final String a) {
+      incrementCount();
+    }
 
-  @Override
-  public void testArray(final int[] ints, final short[] shorts, final byte[] bytes, final boolean[] bools,
-      final float[] floats, final Object[] objects) {
-    incrementCount();
+    @Override
+    public void testArray(final int[] ints, final short[] shorts, final byte[] bytes, final boolean[] bools,
+        final float[] floats, final Object[] objects) {
+      incrementCount();
+    }
   }
 }
diff --git a/src/test/java/games/strategy/engine/message/unifiedmessenger/RemoteMessengerTest.java b/src/test/java/games/strategy/engine/message/unifiedmessenger/RemoteMessengerTest.java
index c5263663054..529e9bf9de3 100644
--- a/src/test/java/games/strategy/engine/message/unifiedmessenger/RemoteMessengerTest.java
+++ b/src/test/java/games/strategy/engine/message/unifiedmessenger/RemoteMessengerTest.java
@@ -323,44 +323,41 @@ public void run() {
       shutdownServerAndClient(server, client);
     }
   }
-}
-
-
-interface IFoo extends IRemote {
-  void foo();
-}
 
+  private interface IFoo extends IRemote {
+    void foo();
+  }
 
-interface ITestRemote extends IRemote {
-  int increment(int testVal);
-
-  void testVoid();
+  private interface ITestRemote extends IRemote {
+    int increment(int testVal);
 
-  void throwException() throws Exception;
-}
+    void testVoid();
 
+    void throwException() throws Exception;
+  }
 
-class TestRemote implements ITestRemote {
-  public static final String EXCEPTION_STRING = "AND GO";
-  private INode m_senderNode;
+  private static class TestRemote implements ITestRemote {
+    public static final String EXCEPTION_STRING = "AND GO";
+    private INode m_senderNode;
 
-  @Override
-  public int increment(final int testVal) {
-    m_senderNode = MessageContext.getSender();
-    return testVal + 1;
-  }
+    @Override
+    public int increment(final int testVal) {
+      m_senderNode = MessageContext.getSender();
+      return testVal + 1;
+    }
 
-  @Override
-  public void testVoid() {
-    m_senderNode = MessageContext.getSender();
-  }
+    @Override
+    public void testVoid() {
+      m_senderNode = MessageContext.getSender();
+    }
 
-  @Override
-  public void throwException() throws Exception {
-    throw new Exception(EXCEPTION_STRING);
-  }
+    @Override
+    public void throwException() throws Exception {
+      throw new Exception(EXCEPTION_STRING);
+    }
 
-  public INode getLastSenderNode() {
-    return m_senderNode;
+    public INode getLastSenderNode() {
+      return m_senderNode;
+    }
   }
 }
diff --git a/src/test/java/games/strategy/net/MessengerTest.java b/src/test/java/games/strategy/net/MessengerTest.java
index c3b611f541f..73b4ab4813f 100644
--- a/src/test/java/games/strategy/net/MessengerTest.java
+++ b/src/test/java/games/strategy/net/MessengerTest.java
@@ -291,80 +291,78 @@ public void testManyClients() throws UnknownHostException, CouldNotLogInExceptio
       clients.get(i).shutDown();
     }
   }
-}
-
-
-class MessageListener implements IMessageListener {
-  private final List<Serializable> messages = new ArrayList<>();
-  private final ArrayList<INode> senders = new ArrayList<>();
-  private final Object lock = new Object();
 
-  @Override
-  public void messageReceived(final Serializable msg, final INode from) {
-    synchronized (lock) {
-      messages.add(msg);
-      senders.add(from);
-      lock.notifyAll();
+  private static class MessageListener implements IMessageListener {
+    private final List<Serializable> messages = new ArrayList<>();
+    private final ArrayList<INode> senders = new ArrayList<>();
+    private final Object lock = new Object();
+
+    @Override
+    public void messageReceived(final Serializable msg, final INode from) {
+      synchronized (lock) {
+        messages.add(msg);
+        senders.add(from);
+        lock.notifyAll();
+      }
     }
-  }
 
-  public void clearLastMessage() {
-    synchronized (lock) {
-      if (messages.isEmpty()) {
-        waitForMessage();
+    public void clearLastMessage() {
+      synchronized (lock) {
+        if (messages.isEmpty()) {
+          waitForMessage();
+        }
+        messages.remove(0);
+        senders.remove(0);
       }
-      messages.remove(0);
-      senders.remove(0);
     }
-  }
 
-  public Object getLastMessage() {
-    synchronized (lock) {
-      if (messages.isEmpty()) {
-        waitForMessage();
+    public Object getLastMessage() {
+      synchronized (lock) {
+        if (messages.isEmpty()) {
+          waitForMessage();
+        }
+        assertFalse(messages.isEmpty());
+        return messages.get(0);
       }
-      assertFalse(messages.isEmpty());
-      return messages.get(0);
     }
-  }
 
-  public INode getLastSender() {
-    synchronized (lock) {
-      if (messages.isEmpty()) {
-        waitForMessage();
+    public INode getLastSender() {
+      synchronized (lock) {
+        if (messages.isEmpty()) {
+          waitForMessage();
+        }
+        return senders.get(0);
       }
-      return senders.get(0);
     }
-  }
 
-  private void waitForMessage() {
-    try {
-      lock.wait(1500);
-    } catch (final InterruptedException e) {
-      fail("unexpected exception: " + e.getMessage());
+    private void waitForMessage() {
+      try {
+        lock.wait(1500);
+      } catch (final InterruptedException e) {
+        fail("unexpected exception: " + e.getMessage());
+      }
     }
-  }
 
-  public int getMessageCount() {
-    synchronized (lock) {
-      return messages.size();
+    public int getMessageCount() {
+      synchronized (lock) {
+        return messages.size();
+      }
     }
   }
-}
-
 
-class MultipleMessageSender implements Runnable {
-  IMessenger m_messenger;
+  private static class MultipleMessageSender implements Runnable {
+    IMessenger m_messenger;
 
-  public MultipleMessageSender(final IMessenger messenger) {
-    m_messenger = messenger;
-  }
+    public MultipleMessageSender(final IMessenger messenger) {
+      m_messenger = messenger;
+    }
 
-  @Override
-  public void run() {
-    Thread.yield();
-    for (int i = 0; i < 100; i++) {
-      m_messenger.broadcast(i);
+    @Override
+    public void run() {
+      Thread.yield();
+      for (int i = 0; i < 100; i++) {
+        m_messenger.broadcast(i);
+      }
     }
   }
 }
diff --git a/src/test/java/games/strategy/thread/ThreadPoolTest.java b/src/test/java/games/strategy/thread/ThreadPoolTest.java
index 7f4ffa7c1e4..4772d4dde52 100644
--- a/src/test/java/games/strategy/thread/ThreadPoolTest.java
+++ b/src/test/java/games/strategy/thread/ThreadPoolTest.java
@@ -88,37 +88,35 @@ private static void threadTestBlock() {
     }
     pool.shutDown();
   }
-}
-
 
-class Task implements Runnable {
-  private boolean done = false;
+  private static class Task implements Runnable {
+    private boolean done = false;
 
-  public synchronized boolean isDone() {
-    return done;
-  }
+    public synchronized boolean isDone() {
+      return done;
+    }
 
-  @Override
-  public void run() {
-    try {
-      Thread.sleep(0, 1);
-    } catch (final InterruptedException e) {
-      throw new IllegalStateException(e);
+    @Override
+    public void run() {
+      try {
+        Thread.sleep(0, 1);
+      } catch (final InterruptedException e) {
+        throw new IllegalStateException(e);
+      }
+      done = true;
     }
-    done = true;
   }
-}
-
 
-class BlockedTask extends Task {
-  @Override
-  public void run() {
-    synchronized (this) {
-      try {
-        wait(10);
-      } catch (final InterruptedException ie) {
+  private static class BlockedTask extends Task {
+    @Override
+    public void run() {
+      synchronized (this) {
+        try {
+          wait(10);
+        } catch (final InterruptedException ie) {
+        }
+        super.run();
       }
-      super.run();
     }
   }
 }
diff --git a/src/test/java/games/strategy/triplea/delegate/LHTRTest.java b/src/test/java/games/strategy/triplea/delegate/LHTRTest.java
index 5bd80118ae1..096d2d253ea 100644
--- a/src/test/java/games/strategy/triplea/delegate/LHTRTest.java
+++ b/src/test/java/games/strategy/triplea/delegate/LHTRTest.java
@@ -24,7 +24,6 @@
 import games.strategy.engine.data.Unit;
 import games.strategy.engine.data.UnitType;
 import games.strategy.engine.data.changefactory.ChangeFactory;
-import games.strategy.engine.random.IRandomSource;
 import games.strategy.engine.random.ScriptedRandomSource;
 import games.strategy.test.TestUtil;
 import games.strategy.triplea.Constants;
@@ -228,20 +227,3 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
     assertEquals(PUsBeforeRaid - 8, PUsAfterRaid);
   }
 }
-
-
-/**
- * a random source that throws when asked for random
- * useful for testing.
- */
-class ThrowingRandomSource implements IRandomSource {
-  @Override
-  public int getRandom(final int max, final String annotation) {
-    throw new IllegalStateException("not allowed");
-  }
-
-  @Override
-  public int[] getRandom(final int max, final int count, final String annotation) {
-    throw new IllegalStateException("not allowed");
-  }
-}
diff --git a/src/test/java/games/strategy/util/PropertyUtilTest.java b/src/test/java/games/strategy/util/PropertyUtilTest.java
index 480dd14eff0..bfa24b621af 100644
--- a/src/test/java/games/strategy/util/PropertyUtilTest.java
+++ b/src/test/java/games/strategy/util/PropertyUtilTest.java
@@ -79,45 +79,38 @@ public void testNoOpSetterMethod() {
         testClass.bar, is("default"));
   }
 
+  private static class NoSetterClass {
+    @SuppressWarnings("unused")
+    private final String bar = PropertyUtilTest.DEFAULT;
+  }
 
-}
-
-
-class NoSetterClass {
-  @SuppressWarnings("unused")
-  private final String bar = PropertyUtilTest.DEFAULT;
-}
-
-
-class InvalidSetterClass {
-  @SuppressWarnings("unused")
-  private final String bar = PropertyUtilTest.DEFAULT;
-
-  public void setBar() {}
-}
-
+  private static class InvalidSetterClass {
+    @SuppressWarnings("unused")
+    private final String bar = PropertyUtilTest.DEFAULT;
 
-class NoOpSetterClass {
-  protected String bar = PropertyUtilTest.DEFAULT;
+    public void setBar() {}
+  }
 
-  public void setBar(final String value) {}
-}
+  private static class NoOpSetterClass {
+    protected String bar = PropertyUtilTest.DEFAULT;
 
+    public void setBar(final String value) {}
+  }
 
-class PropertyClass {
-  protected String bar = PropertyUtilTest.DEFAULT;
+  private static class PropertyClass {
+    protected String bar = PropertyUtilTest.DEFAULT;
 
-  public void setBar(final String newValue) {
-    bar = newValue;
+    public void setBar(final String newValue) {
+      bar = newValue;
+    }
   }
-}
-
 
-class mUnderBarClass {
-  @SuppressWarnings("unused")
-  private String m_bar = PropertyUtilTest.DEFAULT;
+  private static class mUnderBarClass {
+    @SuppressWarnings("unused")
+    private String m_bar = PropertyUtilTest.DEFAULT;
 
-  public void setBar(final String newValue) {
-    m_bar = newValue;
+    public void setBar(final String newValue) {
+      m_bar = newValue;
+    }
   }
 }