diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java b/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java
index c44cf14461..d546973fa0 100644
--- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java
+++ b/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java
@@ -58,7 +58,6 @@ public class UnwrapLoadBalancers implements Function<HttpResponse, Set<LoadBalan
       Map<String, Set<LB>> map = json.apply(arg0);
       if (map.size() == 0)
          return ImmutableSet.<LoadBalancer> of();
-      ;
       return ImmutableSet.copyOf(Iterables.transform(Iterables.get(map.values(), 0), convertLB));
    }
 
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java
index 07bd366d42..5bb089f3e4 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java
@@ -54,9 +54,9 @@ public class BatchResponseHandler<V> extends ParseSax.HandlerForGeneratedRequest
 
    protected BatchResponseHandler(String resultElement, HandlerForGeneratedRequestWithResult<Map.Entry<String, V>> resultHandler,
          BatchErrorHandler errorHandler) {
-      this.resultElement = checkNotNull(resultElement, "resultElement");;
-      this.resultHandler = checkNotNull(resultHandler, "resultHandler");;
-      this.errorHandler = checkNotNull(errorHandler, "errorHandler");;
+      this.resultElement = checkNotNull(resultElement, "resultElement");
+      this.resultHandler = checkNotNull(resultHandler, "resultHandler");
+      this.errorHandler = checkNotNull(errorHandler, "errorHandler");
    }
 
    @Override
diff --git a/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java b/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java
index 9dea30646b..a19bde3fcf 100644
--- a/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java
@@ -72,8 +72,8 @@ public class ParseFirstJsonValueNamed<T> implements Function<HttpResponse, T> {
          AtomicReference<String> name = new AtomicReference<String>();
          JsonToken token = reader.peek();
          for (; token != JsonToken.END_DOCUMENT && nnn(this.name, reader, token, name); token = skipAndPeek(token,
-               reader))
-            ;
+               reader)) {
+         }
          if (name.get() == null) {
             logger.trace("did not object named %s in json from response %s", this.name, arg0);
             return nothing();
diff --git a/labs/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java b/labs/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
index c0d4a04074..5009e574dd 100644
--- a/labs/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
+++ b/labs/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
@@ -107,7 +107,7 @@ public class Operation {
        * @see Operation#getHttpStatusCode()
        */
       public Builder httpStatusCode(Integer httpStatusCode) {
-         this.httpStatusCode = Optional.fromNullable(httpStatusCode);;
+         this.httpStatusCode = Optional.fromNullable(httpStatusCode);
          return this;
       }
 
@@ -139,7 +139,7 @@ public class Operation {
       this.id = checkNotNull(id, "id");
       this.rawStatus = checkNotNull(rawStatus, "rawStatus for %s", id);
       this.status = checkNotNull(status, "status for %s", id);
-      this.httpStatusCode = checkNotNull(httpStatusCode, "httpStatusCode for %s", id);;
+      this.httpStatusCode = checkNotNull(httpStatusCode, "httpStatusCode for %s", id);
       this.error = checkNotNull(error, "error for %s", id);
    }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
index b93d91e7d8..c56829090b 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
@@ -124,7 +124,7 @@ public class Vdc extends Entity {
        * @see Vdc#getAvailableNetworks()
        */
       public B network(Reference availableNetwork) {
-         this.availableNetworks.add(checkNotNull(availableNetwork, "availableNetwork"));;
+         this.availableNetworks.add(checkNotNull(availableNetwork, "availableNetwork"));
          return self();
       }
 
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
index 23448e97e0..79174788ba 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
@@ -127,7 +127,7 @@ public class RasdItem extends ResourceAllocationSettingData {
       super(builder);
       this.type = builder.type;
       this.href = builder.href;
-      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;;
+      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
    }
 
    protected RasdItem() {
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
index 7000396c88..6658ddf449 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
@@ -142,7 +142,7 @@ public class OperatingSystemSection extends org.jclouds.dmtf.ovf.OperatingSystem
       this.osType = builder.osType;
       this.href = builder.href;
       this.type = builder.type;
-      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;;
+      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
    }
 
    protected OperatingSystemSection() {
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
index 393f10b54d..03c7751432 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
@@ -132,7 +132,7 @@ public class VirtualHardwareSection extends org.jclouds.dmtf.ovf.VirtualHardware
       super(builder);
       this.type = builder.type;
       this.href = builder.href;
-      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;;
+      this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
    }
 
    protected VirtualHardwareSection() {
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 041a423b65..e70046662e 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -5,6 +5,7 @@
     <property name="severity" value="warning"/>
     <module name="NewlineAtEndOfFile"/>
     <module name="TreeWalker">
+        <module name="EmptyStatement"/>
         <module name="LineLength">
             <property name="ignorePattern" value="^import\s.*;$"/>
             <property name="max" value="120"/>