diff --git a/test/.gitignore b/test/.gitignore
index 85bce0ce..1b540faa 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,6 +1,7 @@
 all.log
 color.t
 fs.t
+grammar.t
 lexer.t
 list.t
 rx.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index db7f7ed2..b834d47f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TIMEW_INCLUDE_DIRS})
 
-set (test_SRCS color.t fs.t lexer.t list.t rx.t text.t utf8.t)
+set (test_SRCS color.t fs.t grammar.t lexer.t list.t rx.t text.t utf8.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} timew_executable
diff --git a/test/grammar.t.cpp b/test/grammar.t.cpp
new file mode 100644
index 00000000..700e5c51
--- /dev/null
+++ b/test/grammar.t.cpp
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2015, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <Grammar.h>
+#include <test.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int, char**)
+{
+  UnitTest t (2);
+
+  // Test loading from a missing file.
+  Grammar g;
+
+  File missing ("/tmp/does/not/exist");
+  t.ok (! missing.exists (), "Input file does not exist");
+  try
+  {
+    g.loadFromFile (missing);
+    t.fail ("Grammar::loadFromFile did not notice a missing file");
+  }
+  catch (std::string s)
+  {
+    t.pass ("Grammar::loadFromFile noticed a file was missing");
+  }
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+