diff --git a/.travis.yml b/.travis.yml
index 037ca026a..7178c74f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,43 @@ before_script:
   - sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb
   - yes | ./update-geoipdb
 env:
+  - CONFIG_FILE=osx/catalina/catalina_chrome_39.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml
+  - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml
+  - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_14.config.yml
+  - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_81.config.yml
+  - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_5.config.yml
+  - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_75.config.yml
+  - CONFIG_FILE=osx/el_capitan/elcapitan_safari_9-1.config.yml
+  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_14.config.yml
+  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_35.config.yml
+  - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_49.config.yml
+  - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_5.config.yml
+  - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_42.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yml
   - CONFIG_FILE=windows/windows_chrome_latest.config.yml
 # jobs:
 #   include:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 26775c1fe..9ce3f83c6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -69,9 +69,9 @@ RSpec.configure do |config|
     end
   end
   # BrowserStack
-  config.around(:example, :run_on_browserstack => true) do |example|
+  config.around(:context, :run_on_browserstack => true) do |context|
     @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
-    @caps["name"] = ENV['name'] || example.metadata[:name] || example.metadata[:file_path].split('/').last.split('.').first
+    @caps["name"] = ENV['name'] || context.metadata[:name] || context.metadata[:file_path].split('/').last.split('.').first
     enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true"
 
     # Code to start browserstack local before start of test
@@ -99,7 +99,7 @@ RSpec.configure do |config|
 		@session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session']
 
     begin
-      example.run
+      context.run
     ensure 
       @driver.quit
       # Code to stop browserstack local after end of test
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml
deleted file mode 100644
index 006c96d3d..000000000
--- a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "OSX El Capitan Chrome 59"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "chrome"
-    "browser_version": "59.0"
-    "os": "osx"
-    "os_version": "el capitan"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml b/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml
deleted file mode 100644
index 998a63b59..000000000
--- a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-server: "hub-cloud.browserstack.com"
-
-common_caps:
-  "build": "OSX El Capitan Firefox 68 ESR"
-  "project": "BeEF"
-  "browserstack.local": true
-  "browserstack.video": false
-
-browser_caps:
-  -
-    "browser": "firefox"
-    "browser_version": "68.0"
-    "os": "osx"
-    "os_version": "el capitan"
\ No newline at end of file
diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_48esr.config.yml b/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml
similarity index 74%
rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_48esr.config.yml
rename to spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml
index 3cda179f4..306842b6a 100644
--- a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_48esr.config.yml
+++ b/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml
@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Snow Leopard Firefox 48 ESR"
+  "build": "OSX Snow Leopard Firefox 38 ESR"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "48.0"
+    "browser_version": "38.0"
     "os": "osx"
     "os_version": "snow leopard"
\ No newline at end of file