diff --git a/src/spec/integration_support/director.rb b/src/spec/integration_support/director.rb
index 2fd8b4ac0c..cd397ac679 100644
--- a/src/spec/integration_support/director.rb
+++ b/src/spec/integration_support/director.rb
@@ -85,7 +85,7 @@ def wait_for_vm(instance_group_name, index, timeout_seconds, options = {deployme
     end
 
     def wait_for_first_available_instance(timeout = 60, options = {deployment_name: SharedSupport::DeploymentManifestHelper::DEFAULT_DEPLOYMENT_NAME})
-      @waiter.wait(timeout) { instances(options).first || raise('Must have at least 1 VM') }
+      @waiter.wait(timeout) { instances(options).first || raise('Must have at least 1 Instance') }
     end
 
     def wait_for_first_available_vm(timeout = 60)
diff --git a/src/spec/integration_support/director_service.rb b/src/spec/integration_support/director_service.rb
index 80ae08c05c..9c1ebede30 100644
--- a/src/spec/integration_support/director_service.rb
+++ b/src/spec/integration_support/director_service.rb
@@ -101,7 +101,7 @@ def wait_for_tasks_to_finish
 
       until delayed_job_done?
         if attempt > max_attempts
-          @logger.error("Delayed Job queue failed to drain in #{timeout} seconds}")
+          @logger.error("Delayed Job queue failed to drain in #{timeout} seconds")
           @db_helper.current_tasks.each do |current_task|
             @logger.error("#{DEBUG_HEADER} Current task '#{current_task[:description]}' #{DEBUG_HEADER}:")
             @logger.error(File.read(File.join(current_task[:output], 'debug')))
diff --git a/src/spec/integration_support/instance.rb b/src/spec/integration_support/instance.rb
index 69ae1d1ecf..f06889969f 100644
--- a/src/spec/integration_support/instance.rb
+++ b/src/spec/integration_support/instance.rb
@@ -102,9 +102,9 @@ def package_path(package_name)
 
     def unblock_errand(job_name)
       job_dir_path = job_path(job_name)
-      @logger.debug("Unblocking package at #{job_dir_path}")
+      @logger.debug("Unblocking errand at #{job_dir_path}")
 
-      @waiter.wait(15) do
+      @waiter.wait(300) do
         raise('Must find errand dir') unless File.exist?(job_dir_path)
 
         FileUtils.touch(File.join(job_dir_path, 'unblock_errand'))
diff --git a/src/spec/integration_support/vm.rb b/src/spec/integration_support/vm.rb
index f66aeabec5..4ec18f6993 100644
--- a/src/spec/integration_support/vm.rb
+++ b/src/spec/integration_support/vm.rb
@@ -86,9 +86,9 @@ def package_path(package_name)
 
     def unblock_errand(job_name)
       job_dir_path = job_path(job_name)
-      @logger.debug("Unblocking package at #{job_dir_path}")
+      @logger.debug("Unblocking errand at #{job_dir_path}")
 
-      @waiter.wait(15) do
+      @waiter.wait(300) do
         raise('Must find errand dir') unless File.exist?(job_dir_path)
         FileUtils.touch(File.join(job_dir_path, 'unblock_errand'))
       end