diff --git a/redash/controllers.py b/redash/controllers.py
index dedb102c5..3cfc9297f 100644
--- a/redash/controllers.py
+++ b/redash/controllers.py
@@ -31,8 +31,8 @@ def ping():
 
 @app.route('/admin/<anything>')
 @app.route('/dashboard/<anything>')
-@app.route('/queries/')
-@app.route('/queries/<query_id>/')
+@app.route('/queries')
+@app.route('/queries/<query_id>')
 @app.route('/queries/<query_id>/<anything>')
 @app.route('/')
 @auth.required
diff --git a/tests/test_controllers.py b/tests/test_controllers.py
index 314909222..d370c2d6f 100644
--- a/tests/test_controllers.py
+++ b/tests/test_controllers.py
@@ -71,7 +71,7 @@ class PingTest(TestCase):
 
 class IndexTest(BaseTestCase, AuthenticationTestMixin):
     def setUp(self):
-        self.paths = ['/', '/dashboard/example', '/queries/1/', '/admin/status']
+        self.paths = ['/', '/dashboard/example', '/queries/1', '/admin/status']
         super(IndexTest, self).setUp()