diff --git a/devstack/settings b/devstack/settings
index 0495b04edc..9d926c6d96 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -35,7 +35,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE}
 TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT}
 TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT}
 TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT}
-TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT}
+TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200}
 TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT}
 TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT}
 TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME}
diff --git a/integration/tests/integration/int_tests.py b/integration/tests/integration/int_tests.py
index a13eb6eb6e..b139820a80 100644
--- a/integration/tests/integration/int_tests.py
+++ b/integration/tests/integration/int_tests.py
@@ -252,9 +252,6 @@ def run_main(test_importer):
         # we want to start a REPL.
         sys.exit = lambda x: None
 
-    print("Integration tests are temporarily disabled")
-    return 0
-
     proboscis.TestProgram(argv=nose_args, groups=groups, config=c,
                           testRunner=MAIN_RUNNER).run_and_exit()
     sys.stdout = sys.__stdout__