diff --git a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb
index 49972e920..e33b8c66a 100644
--- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb
+++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb
@@ -93,7 +93,8 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do
 		@driver.navigate.to "#{VICTIM_URL}"
 
 		# Give time for browser hook to occur
-		sleep 3.5
+		wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds
+		wait.until { @driver.execute_script("return !!window.beef.session").equal? true}
 
 		@hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}")
 		@session = @hooks['hooked-browsers']['online']['0']['session']
diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
index cebbf4fae..92ea71cfb 100644
--- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb
+++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
@@ -90,7 +90,8 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do
 		@driver.navigate.to "#{VICTIM_URL}"
 
 		# Give time for browser hook to occur
-		sleep 3.5
+		wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds
+		wait.until { @driver.execute_script("return !!window.beef.session").equal? true}
 
 		@hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}")
 		@session = @hooks['hooked-browsers']['online']['0']['session']