diff --git a/config.ru b/config.ru
index b059d823..72980fa4 100644
--- a/config.ru
+++ b/config.ru
@@ -4,8 +4,8 @@ require 'travis/api/app'
 env, api_endpoint, client_endpoint, run_api, watch, deflate = ENV.values_at('RACK_ENV', 'API_ENDPOINT', 'CLIENT_ENDPOINT', 'RUN_API', 'WATCH', 'DEFLATE')
 
 env             ||= "development"
-api_endpoint    ||= "https://api.#{Travis.config.host}" if env == "production"
-run_api         ||= ["development", "test"].include? env
+api_endpoint    ||= "https://api.#{Travis.config.host}" unless run_api
+run_api         ||= api_endpoint.to_s.start_with? '/'
 api_endpoint    ||= "/api" if run_api and run_api != '0'
 client_endpoint ||= "/"
 watch           ||= false #env == "development"