diff --git a/.travis.yml b/.travis.yml
index 3a9635a86180a..b471f0f591b60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,8 @@ matrix:
     - env: IMAGE=x86_64-gnu-debug
     - env: IMAGE=x86_64-gnu-nopt
     - env: IMAGE=x86_64-gnu-make
-    - env: IMAGE=x86_64-gnu-llvm-3.7 ALLOW_PR=1 RUST_BACKTRACE=1
+    - env: IMAGE=x86_64-gnu-llvm-3.7 RUST_BACKTRACE=1
+    - env: IMAGE=x86_64-gnu-grammartest ALLOW_PR=1
     - env: IMAGE=x86_64-musl
 
     # OSX builders
diff --git a/src/ci/docker/README.md b/src/ci/docker/README.md
new file mode 100644
index 0000000000000..f5dfe8bf20aff
--- /dev/null
+++ b/src/ci/docker/README.md
@@ -0,0 +1,15 @@
+# Testing containers locally
+
+Make sure, you have all required modules unpacked:
+```
+git submodule update --init
+```
+
+Use the `run.sh` from `src/ci/docker`.
+The `src/ci/run.sh` is used inside the container.
+
+```
+src/ci/docker/run.sh x86_64-gnu-grammartest
+```
+
+You can choose one of the targes from `src/ci/docker`.
diff --git a/src/ci/docker/x86_64-gnu-grammartest/Dockerfile b/src/ci/docker/x86_64-gnu-grammartest/Dockerfile
new file mode 100644
index 0000000000000..8edcacffc7106
--- /dev/null
+++ b/src/ci/docker/x86_64-gnu-grammartest/Dockerfile
@@ -0,0 +1,30 @@
+FROM ubuntu:16.10
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  file \
+  curl \
+  ca-certificates \
+  python \
+  git \
+  cmake \
+  ccache \
+  sudo \
+  gdb \
+  llvm-3.9-tools \
+  libedit-dev \
+  zlib1g-dev \
+  antlr4 \
+  bison \
+  flex \
+  openjdk-8-jdk-headless
+
+RUN cd /usr/local/lib && curl http://www.antlr.org/download/antlr-4.5.3-complete.jar -o antlr-complete.jar
+
+ENV RUST_CONFIGURE_ARGS \
+         --build=x86_64-unknown-linux-gnu \
+         --llvm-root=/usr/lib/llvm-3.9
+ENV RUST_CHECK_TARGET check-grammar
+RUN mkdir /tmp/obj
+RUN chmod 777 /tmp/obj
diff --git a/src/grammar/README.md b/src/grammar/README.md
index cd2dd38de36aa..8098172c6e372 100644
--- a/src/grammar/README.md
+++ b/src/grammar/README.md
@@ -2,10 +2,23 @@
 
 Uses [antlr4](http://www.antlr.org/) and a custom Rust tool to compare
 ASTs/token streams generated. You can use the `make check-lexer` target to
-run all of the available tests.
+run all of the available tests or `make check-grammar` and focus on the grammar checks.
 
 The build of the rust part is included with `make tidy` and can be run with `make check-build-lexer-verifier`.
 
+## Running one grammar test
+
+First you need to setup your environment:
+```
+./configure
+make check-grammar
+```
+
+Then run the check you would like:
+```
+grammar/parser-lalr < src/test/compile-fail/E0063.rs
+```
+
 # Manual build
 
 To use manually, assuming antlr4 ist installed at `/usr/share/java/antlr-complete.jar`:
diff --git a/src/grammar/parser-lalr-main.c b/src/grammar/parser-lalr-main.c
index db88a1f2999aa..bb07a6d668d56 100644
--- a/src/grammar/parser-lalr-main.c
+++ b/src/grammar/parser-lalr-main.c
@@ -12,10 +12,13 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+// Forward declare strdup from <string.h> to avoid warning during compilation
+char *strdup(const char *s);
 
 extern int yylex();
 extern int rsparse();
 
+
 #define PUSHBACK_LEN 4
 
 static char pushback[PUSHBACK_LEN];
@@ -73,7 +76,7 @@ int n_nodes;
 struct node *mk_node(char const *name, int n, ...) {
   va_list ap;
   int i = 0;
-  unsigned sz = sizeof(struct node) + (n * sizeof(struct node *));
+  unsigned int sz = sizeof(struct node) + (n * sizeof(struct node *));
   struct node *nn, *nd = (struct node *)malloc(sz);
 
   print("# New %d-ary node: %s = %p\n", n, name, nd);
@@ -114,7 +117,7 @@ struct node *mk_none() {
 struct node *ext_node(struct node *nd, int n, ...) {
   va_list ap;
   int i = 0, c = nd->n_elems + n;
-  unsigned sz = sizeof(struct node) + (c * sizeof(struct node *));
+  unsigned int sz = sizeof(struct node) + (c * sizeof(struct node *));
   struct node *nn;
 
   print("# Extending %d-ary node by %d nodes: %s = %p",
diff --git a/src/grammar/testparser.py b/src/grammar/testparser.py
index 37be41b935f84..f58709da00a54 100755
--- a/src/grammar/testparser.py
+++ b/src/grammar/testparser.py
@@ -69,8 +69,12 @@
 
 for parser in args.parser:
     filename = os.path.basename(parser) + '.bad'
-    print("writing {} files that did not yield the correct result with {} to {}".format(len(bad[parser]), parser, filename))
+    bad_tests = len(bad[parser])
+    print("writing {} files that did not yield the correct result with {} to {}\n".format(bad_tests, parser, filename))
     with open(filename, "w") as f:
         for p in bad[parser]:
+            print("bad test: {}".format(p))
             f.write(p)
             f.write("\n")
+    if bad_tests > 0:
+      exit(1)
diff --git a/src/test/compile-fail/E0063.rs b/src/test/compile-fail/E0063.rs
index e7044102abc71..c8f821940ddc5 100644
--- a/src/test/compile-fail/E0063.rs
+++ b/src/test/compile-fail/E0063.rs
@@ -40,15 +40,15 @@ struct TruncatedPluralFoo {
 
 fn main() {
     let w = SingleFoo { };
-    //~^ ERROR missing field `x` in initializer of `SingleFoo`
-    //~| NOTE missing `x`
+    //~error[E0063]: missing field `x` in initializer of `SingleFoo`
+    //~^^^ missing `x`
     let x = PluralFoo {x: 1};
-    //~^ ERROR missing fields `y`, `z` in initializer of `PluralFoo`
-    //~| NOTE missing `y`, `z`
+    //~error[E0063]: missing fields `y`, `z` in initializer of `PluralFoo`
+    //~^^^ missing `y`, `z`
     let y = TruncatedFoo{x:1};
     //~^ missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo`
-    //~| NOTE `a`, `b`, `y` and 1 other field
+    //~^^^ `a`, `b`, `y` and 1 other field
     let z = TruncatedPluralFoo{x:1};
-    //~^ ERROR missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo`
-    //~| NOTE missing `a`, `b`, `c` and 2 other fields
+    //~error[E0063]: missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo`
+    //~^^^ missing `a`, `b`, `c` and 2 other fields
 }