diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
index 85183c1757a..7a711fc8ee1 100644
--- a/ckan/config/deployment.ini_tmpl
+++ b/ckan/config/deployment.ini_tmpl
@@ -160,6 +160,10 @@ ckan.locale_default = en
 ckan.locale_order = en de fr it es pl ru nl sv no cs_CZ hu pt_BR fi bg ca sq sr sr_Latn
 ckan.locales_filtered_out = el ro lt sl
 
+## Webstore
+## Uncommment to enable webstore
+# ckan.webstore.enabled = 1
+
 ## ===================================
 ## Extensions
 
diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index 1d57d39acc9..7e645608252 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -235,17 +235,20 @@ def make_map():
     map.connect('/dataset/{id}/resource/{resource_id}',
         controller='package', action="resource_read"
     )
-    map.redirect('/dataset/{id}/resource/{resource_id}/data{url:.*?}',
-        '/api/resource/{resource_id}/data{url}', id=None
-    )
-    map.connect('webstore_read', '/api/resource/{id}/data{url:.*?}',
-        controller='webstore', action='read', url='',
-        conditions={'method': ['GET']}
-        )
-    map.connect('webstore_write', '/api/resource/{id}/data{url:.*?}',
-        controller='webstore', action='write', url='',
-        conditions={'method': ['PUT','POST', 'DELETE']}
+
+    ## Webstore
+    if config.get('ckan.webstore.enabled', False):
+        map.redirect('/dataset/{id}/resource/{resource_id}/data{url:.*?}',
+            '/api/resource/{resource_id}/data{url}', id=None
         )
+        map.connect('webstore_read', '/api/resource/{id}/data{url:.*?}',
+            controller='webstore', action='read', url='',
+            conditions={'method': ['GET']}
+            )
+        map.connect('webstore_write', '/api/resource/{id}/data{url:.*?}',
+            controller='webstore', action='write', url='',
+            conditions={'method': ['PUT','POST', 'DELETE']}
+            )
 
     # group
     map.redirect("/groups", "/group")
diff --git a/test-core.ini b/test-core.ini
index 7d9d4d6db54..f1f66c6a55c 100644
--- a/test-core.ini
+++ b/test-core.ini
@@ -59,6 +59,8 @@ ckan.mail_from = info@test.ckan.net
 
 ckan.locale_default = en
 
+ckan.webstore.enabled = 1
+
 ckanext.stats.cache_enabled = 0
 
 # Logging configuration