diff --git a/pom.xml b/pom.xml
index 949098ff..73a787cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ Less4j is a port. The original compiler was written in JavaScript and is called
 	<properties>
 		<slf4j.version>1.6.6</slf4j.version>
 		<wro4j.version>1.4.6</wro4j.version>
-		<antlr.version>3.4</antlr.version>
+		<antlr.version>3.5.2</antlr.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g b/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g
index 9fd2e3b1..5ab2e007 100644
--- a/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g
+++ b/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g
@@ -142,7 +142,7 @@ tokens {
   public Token nextToken() {
         super.nextToken();
         if ( tokens.size()==0 ) {
-            return Token.EOF_TOKEN;
+            return getEOFToken();
         }
         return (Token)tokens.remove(0);
   }
diff --git a/src/main/java/com/github/sommeri/less4j/core/parser/HiddenTokenAwareTree.java b/src/main/java/com/github/sommeri/less4j/core/parser/HiddenTokenAwareTree.java
index 74f88158..a4c89075 100644
--- a/src/main/java/com/github/sommeri/less4j/core/parser/HiddenTokenAwareTree.java
+++ b/src/main/java/com/github/sommeri/less4j/core/parser/HiddenTokenAwareTree.java
@@ -46,10 +46,11 @@ public HiddenTokenAwareTree getChild(int i) {
 
   @SuppressWarnings("unchecked")
   public List<HiddenTokenAwareTree> getChildren() {
-    List<HiddenTokenAwareTree> result = super.getChildren();
+    List<? extends Object> result = super.getChildren();
     if (result == null)
       result = Collections.emptyList();
-    return result;
+
+    return (List<HiddenTokenAwareTree>) result;
   }
 
   public boolean hasChildren() {
diff --git a/src/test/java/com/github/sommeri/less4j/grammar/GrammarAsserts.java b/src/test/java/com/github/sommeri/less4j/grammar/GrammarAsserts.java
index 766c24f7..00a907c4 100644
--- a/src/test/java/com/github/sommeri/less4j/grammar/GrammarAsserts.java
+++ b/src/test/java/com/github/sommeri/less4j/grammar/GrammarAsserts.java
@@ -125,11 +125,11 @@ public Object post(Object t) {
   }
 
   private int countOnChannelTokes(int start, int end) {
-    @SuppressWarnings("unchecked")
-    List<CommonToken> list = tokens.get(start, end);
+    List<? extends Token> list = tokens.get(start, end);
     int count = 0;
-    for (CommonToken token : list) {
-      if (isOnChannel(token) && !isDummy(token))
+    for (Token token : list) {
+      CommonToken commonToken = CommonToken.class.cast(token);
+      if (isOnChannel(commonToken) && !isDummy(commonToken))
         count++;
     }
     return count;
diff --git a/src/test/java/com/github/sommeri/less4j/resources/Less4jExceptionTest.java b/src/test/java/com/github/sommeri/less4j/resources/Less4jExceptionTest.java
index 09d1c98e..9b2f9610 100644
--- a/src/test/java/com/github/sommeri/less4j/resources/Less4jExceptionTest.java
+++ b/src/test/java/com/github/sommeri/less4j/resources/Less4jExceptionTest.java
@@ -40,7 +40,7 @@ public void testThreeErrors() {
   @Test
   public void testAntlrError() {
     String less = ".class { margin: 1 1 1 1; ";
-    String expectedError = "Could not compile less. 1 error(s) occurred:\nERROR 0:0 no viable alternative at input '<EOF>' in ruleset (which started at 1:1)\n";
+    String expectedError = "Could not compile less. 1 error(s) occurred:\nERROR 1:27 no viable alternative at input '<EOF>' in ruleset (which started at 1:1)\n";
 
     expectCompileError(less, expectedError);
   }
diff --git a/src/test/resources/compile-basic-features/import/import-syntactically-incorrect-unclosed-ruleset.err b/src/test/resources/compile-basic-features/import/import-syntactically-incorrect-unclosed-ruleset.err
index aaa249dc..c41bedf2 100644
--- a/src/test/resources/compile-basic-features/import/import-syntactically-incorrect-unclosed-ruleset.err
+++ b/src/test/resources/compile-basic-features/import/import-syntactically-incorrect-unclosed-ruleset.err
@@ -1,2 +1,2 @@
 Errors produced by compilation of testCase
-ERROR import#FILE_SEPARATOR#syntactically-incorrect-unclosed-ruleset.less 0:0 no viable alternative at input '<EOF>' in ruleset (which started at 2:1)
+ERROR import#FILE_SEPARATOR#syntactically-incorrect-unclosed-ruleset.less 4:3 no viable alternative at input '<EOF>' in ruleset (which started at 2:1)
diff --git a/src/test/resources/error-handling/lexer-errors.err b/src/test/resources/error-handling/lexer-errors.err
index c98b38e2..8046fa1f 100644
--- a/src/test/resources/error-handling/lexer-errors.err
+++ b/src/test/resources/error-handling/lexer-errors.err
@@ -1,4 +1,4 @@
 Errors produced by compilation of testCase
 ERROR 2:29 no viable alternative at character ';'
 ERROR 7:2 mismatched character '<EOF>' expecting '*'
-ERROR 0:0 no viable alternative at input '<EOF>' in ruleset (which started at 5:1)
+ERROR 7:2 no viable alternative at input '<EOF>' in ruleset (which started at 5:1)
diff --git a/src/test/resources/error-handling/parser-errors.err b/src/test/resources/error-handling/parser-errors.err
index 264b8877..17fb95b0 100644
--- a/src/test/resources/error-handling/parser-errors.err
+++ b/src/test/resources/error-handling/parser-errors.err
@@ -1,4 +1,4 @@
 Errors produced by compilation of testCase
 ERROR 1:10 no viable alternative at input ':' in unknown ruleset (which started at 1:1)
 ERROR 1:12 extraneous input '2' expecting 'identifier' in selectors (which started at 1:10)
-ERROR 0:0 no viable alternative at input '<EOF>' in ruleset (which started at 1:10)
+ERROR 5:1 no viable alternative at input '<EOF>' in ruleset (which started at 1:10)