diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java
index c4c32caafb..d2c1238cf0 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/SecurityGroupApiLiveTest.java
@@ -231,7 +231,7 @@ public class SecurityGroupApiLiveTest extends BaseComputeServiceContextLiveTest
       }
    }
 
-   public final class TCPPort80AllIPs implements Predicate<IpPermission> {
+   public static final class TCPPort80AllIPs implements Predicate<IpPermission> {
       @Override
       public boolean apply(IpPermission arg0) {
          return arg0.getIpProtocol() == IpProtocol.TCP && arg0.getFromPort() == 80 && arg0.getToPort() == 80
diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
index de985fd8fc..852a1a1972 100644
--- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
+++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
@@ -140,7 +140,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp
             getParameterReaders(gson, deserializationTarget));
    }
 
-   private final class DeserializeIntoParameterizedConstructor<T> extends TypeAdapter<T> {
+   private static final class DeserializeIntoParameterizedConstructor<T> extends TypeAdapter<T> {
       private final TypeAdapter<T> serializer;
       private final Invokable<T, T> parameterizedCtor;
       private final Map<String, ParameterReader<?>> parameterReaders;
diff --git a/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java b/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
index ef3767e31e..b1a23d9df6 100644
--- a/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
+++ b/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
@@ -100,7 +100,7 @@ public abstract class NullHackJsonLiteralAdapter<L> extends TypeAdapter<L> {
       }
    }
 
-   public final class NullReplacingWriter extends Writer {
+   public static final class NullReplacingWriter extends Writer {
       private final Writer delegate;
       private final String nullReplacement;
 
diff --git a/core/src/test/java/org/jclouds/date/DateServiceTest.java b/core/src/test/java/org/jclouds/date/DateServiceTest.java
index 93cafbe5f7..ba2b7bdee6 100644
--- a/core/src/test/java/org/jclouds/date/DateServiceTest.java
+++ b/core/src/test/java/org/jclouds/date/DateServiceTest.java
@@ -50,7 +50,7 @@ public class DateServiceTest extends PerformanceTest {
 
    protected TestData[] testData;
 
-   protected class TestData {
+   protected static class TestData {
       public final String iso8601DateString;
       public final String iso8601DateStringTz;
 
diff --git a/core/src/test/java/org/jclouds/http/internal/WireTest.java b/core/src/test/java/org/jclouds/http/internal/WireTest.java
index 9057fd5aed..026cdff684 100644
--- a/core/src/test/java/org/jclouds/http/internal/WireTest.java
+++ b/core/src/test/java/org/jclouds/http/internal/WireTest.java
@@ -32,7 +32,7 @@ import static org.testng.Assert.assertNotEquals;
 @Test(groups = "unit", sequential = true)
 public class WireTest {
 
-   class BufferLogger implements Logger {
+   static class BufferLogger implements Logger {
       StringBuilder buff = new StringBuilder();
 
       public void debug(String message, Object... args) {
diff --git a/core/src/test/java/org/jclouds/internal/BaseViewTest.java b/core/src/test/java/org/jclouds/internal/BaseViewTest.java
index 6e34220ceb..75be8df31c 100644
--- a/core/src/test/java/org/jclouds/internal/BaseViewTest.java
+++ b/core/src/test/java/org/jclouds/internal/BaseViewTest.java
@@ -81,7 +81,7 @@ public class BaseViewTest {
       }
    }
 
-   public class DummyView extends BaseView {
+   public static class DummyView extends BaseView {
 
       protected DummyView(ApiContext<DummyApi> context) {
          super(context, new TypeToken<ApiContext<DummyApi>>() {
diff --git a/core/src/test/java/org/jclouds/proxy/ProxyForURITest.java b/core/src/test/java/org/jclouds/proxy/ProxyForURITest.java
index 261f24b813..86ab6e6f1c 100644
--- a/core/src/test/java/org/jclouds/proxy/ProxyForURITest.java
+++ b/core/src/test/java/org/jclouds/proxy/ProxyForURITest.java
@@ -40,7 +40,7 @@ public class ProxyForURITest {
    private Optional<HostAndPort> hostAndPort = Optional.of(HostAndPort.fromParts("proxy.example.com", 8080));
    private Optional<Credentials> creds = Optional.of(new Credentials("user", "pwd"));
 
-   private class MyProxyConfig implements ProxyConfig {
+   private static class MyProxyConfig implements ProxyConfig {
       private boolean useSystem;
       private boolean jvmProxyEnabled;
       private Type type;
diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
index 6a9dd737b3..b917d5b0a9 100644
--- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
@@ -633,7 +633,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertPayloadEquals(request, "", "application/octet-stream", false);
    }
 
-   private class TestHttpRequestOptions extends BaseHttpRequestOptions {
+   private static class TestHttpRequestOptions extends BaseHttpRequestOptions {
       TestHttpRequestOptions payload(String payload) {
          this.payload = payload;
          return this;
@@ -720,7 +720,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertPayloadEquals(request, "last_payload_wins!", "application/unknown", false);
    }
 
-   public class TestCustomMethod {
+   public static class TestCustomMethod {
       @FOO
       public void foo() {
       }
@@ -738,7 +738,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       void foo();
    }
 
-   public class TestOverridden implements Parent {
+   public static class TestOverridden implements Parent {
       @POST
       public void foo() {
       }
@@ -1808,7 +1808,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertEquals(headers.get("x-amz-copy-source"), ImmutableList.of("/eggs/robot"));
    }
 
-   public class TestReplaceQueryOptions extends BaseHttpRequestOptions {
+   public static class TestReplaceQueryOptions extends BaseHttpRequestOptions {
       public TestReplaceQueryOptions() {
          this.queryParameters.put("x-amz-copy-source", "/{bucket}");
       }
@@ -2198,7 +2198,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
             ImmutableList.of(dateService.rfc822DateFormat(date)));
    }
 
-   public class PrefixOptions extends BaseHttpRequestOptions {
+   public static class PrefixOptions extends BaseHttpRequestOptions {
       public PrefixOptions withPrefix(String prefix) {
          queryParameters.put("prefix", checkNotNull(prefix, "prefix"));
          return this;
@@ -2245,7 +2245,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertEquals(request.getHeaders().size(), 0);
    }
 
-   public class PayloadOptions extends BaseHttpRequestOptions {
+   public static class PayloadOptions extends BaseHttpRequestOptions {
       @Override
       public String buildStringPayload() {
          return "foo";
@@ -2504,7 +2504,7 @@ public class RestAnnotationProcessorTest extends BaseRestApiTest {
       assertPayloadEquals(request, "test", "application/unknown", false);
    }
 
-   public class TestReplaceFormOptions extends BaseHttpRequestOptions {
+   public static class TestReplaceFormOptions extends BaseHttpRequestOptions {
       public TestReplaceFormOptions() {
          this.formParameters.put("x-amz-copy-source", "/{bucket}");
       }
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
index 8fa40b012b..83d4292080 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
@@ -57,7 +57,7 @@ public class InstanceToNodeMetadataTest {
     * The predicates returned always evaluate to true.
     *
     */
-   class FixedGroupNamingConvention implements GroupNamingConvention {
+   static class FixedGroupNamingConvention implements GroupNamingConvention {
       private final String name;
 
       public FixedGroupNamingConvention(final String name) {
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java
index 983df04b66..8d1fe8350f 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java
@@ -168,7 +168,7 @@ public class VirtualGuestToJson implements Binder {
       return ImmutableList.copyOf(blockDevices);
    }
 
-   public class BlockDevicesComparator implements Comparator<BlockDevice> {
+   public static class BlockDevicesComparator implements Comparator<BlockDevice> {
 
       @Override
       public int compare(BlockDevice b1, BlockDevice b2) {
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
index 773c474c1b..e5f34f67b4 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
@@ -554,7 +554,7 @@ public class SoftLayerComputeServiceAdapter implements
       }
    }
 
-   private class IsOperatingSystem implements Predicate<SoftwareDescription> {
+   private static class IsOperatingSystem implements Predicate<SoftwareDescription> {
       @Override
       public boolean apply(SoftwareDescription softwareDescription) {
          // operatingSystem is set to '1' if this Software Description describes an Operating System.