diff --git a/.travis.yml b/.travis.yml
index 3bc79dcc..74198cea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - '2.7'
   - 'pypy'
   - '3.5'
+  - '3.6'
 
 install:
   - pip install -e .
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 1fef465a..0b19777d 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -317,7 +317,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
 
         symbols = dict(app=app)
         try:
-            exec(data + '\n', symbols)
+            exec(data, symbols)
         except SyntaxError as e:
             logger.error(
                 '%s has a syntax error and will not be loaded\n' % path
diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py
index ad454fcb..132f8a04 100644
--- a/gluon/tests/test_router.py
+++ b/gluon/tests/test_router.py
@@ -95,14 +95,14 @@ class TestRouter(unittest.TestCase):
         """ Test router syntax error """
         level = logger.getEffectiveLevel()
         logger.setLevel(logging.CRITICAL)  # disable logging temporarily
-        self.assertRaises(SyntaxError, load, data='x:y')
+        self.assertRaises(SyntaxError, load, data='x::y')
         self.assertRaises(
             SyntaxError, load, rdict=dict(BASE=dict(badkey="value")))
         self.assertRaises(SyntaxError, load, rdict=dict(
             BASE=dict(), app=dict(default_application="name")))
 
         self.myassertRaisesRegex(SyntaxError, "invalid syntax",
-                                load, data='x:y')
+                                load, data='x::y')
         self.myassertRaisesRegex(SyntaxError, "unknown key",
                                 load, rdict=dict(BASE=dict(badkey="value")))
         self.myassertRaisesRegex(SyntaxError, "BASE-only key",