diff --git a/src/main/java/com/google/gwtorm/nosql/AccessGen.java b/src/main/java/com/google/gwtorm/nosql/AccessGen.java
index 41de1a6..c84fab5 100644
--- a/src/main/java/com/google/gwtorm/nosql/AccessGen.java
+++ b/src/main/java/com/google/gwtorm/nosql/AccessGen.java
@@ -624,7 +624,7 @@
     return Collections.emptyList();
   }
 
-  private final class QueryCGS extends IndexFunctionGen.EncodeCGS {
+  private static final class QueryCGS extends IndexFunctionGen.EncodeCGS {
     private final Type[] pTypes;
     private final List<ColumnModel> pCols;
     private final int[] pVars;
diff --git a/src/test/java/com/google/gwtorm/schema/QueryParserTest.java b/src/test/java/com/google/gwtorm/schema/QueryParserTest.java
index 471de76..b94ddff 100644
--- a/src/test/java/com/google/gwtorm/schema/QueryParserTest.java
+++ b/src/test/java/com/google/gwtorm/schema/QueryParserTest.java
@@ -27,7 +27,7 @@
 import org.junit.Test;
 
 public class QueryParserTest {
-  private final class DummyColumn extends ColumnModel {
+  private static final class DummyColumn extends ColumnModel {
     private String name;
 
     DummyColumn(final int id, final String n) {