diff --git a/.travis.yml b/.travis.yml
index 2ef605ca..38ff17db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_script:
   - flake8 . --count --max-complexity=15 --show-source --statistics
 script:
   - python app/server.py > /dev/null &
-  - pytest --capture=sys
+  - pytest --capture=sys --showlocals
   - kill $(lsof -t -i:7001)
 after_success:
   - codecov
diff --git a/app/server.py b/app/server.py
index 9ce35164..39947436 100644
--- a/app/server.py
+++ b/app/server.py
@@ -23,14 +23,10 @@
 parser.add_argument("--dev", help=help_msg, action="store_true")
 args = parser.parse_args()
 
-search_engines = ["google", "yahoo", "bing", "ask", "duckduckgo", "yandex",
-                  "youtube", "exalead", "mojeek", "dailymotion", "parsijoo",
-                  "quora", "baidu"]
-
 
 @app.route('/')
 def index():
-    return render_template('index.html', engines_list=search_engines)
+    return render_template('index.html', engines_list=scrapers.keys())
 
 
 def bad_request(error):
diff --git a/app/test_server.py b/app/test_server.py
index 3d987b19..b3968d01 100644
--- a/app/test_server.py
+++ b/app/test_server.py
@@ -3,7 +3,7 @@
 import pytest
 import requests
 
-from .scrapers import small_test
+from .scrapers import scrapers, small_test
 
 REASON = 'Do you have query-server running on http://127.0.0.1:7001 ?'
 TRAVIS_CI = os.getenv('TRAVIS', False)  # Running in Travis CI?
@@ -30,7 +30,5 @@ def make_engine_api_call(engine_name):
 
 @pytest.mark.xfail(not TRAVIS_CI, reason=REASON)
 def test_engine_api_calls(engine_names=None):
-    engines = """ask baidu bing dailymotion duckduckgo exalead google
-                 mojeek parsijoo quora yahoo yandex youtube""".split()
-    for engine_name in (engine_names or engines):
+    for engine_name in (engine_names or scrapers):
         make_engine_api_call(engine_name)