diff --git a/scripts/browserstack.js b/scripts/browserstack.js
index e3b3b84..47a9d7a 100755
--- a/scripts/browserstack.js
+++ b/scripts/browserstack.js
@@ -37,6 +37,10 @@ var settings = {
   build: 'testem-browserstack'
 };
 
+if (process.env.BROWSERSTACK_LOCAL_IDENTIFIER) {
+  settings['browserstack.localIdentifier'] = process.env.BROWSERSTACK_LOCAL_IDENTIFIER
+}
+
 for (var i in settings) {
   if (settings[i] === null || settings[i] === '' || settings[i] === 'nil') {
     delete settings[i];
diff --git a/testem.json b/testem.json
index fb5efd3..4650ede 100644
--- a/testem.json
+++ b/testem.json
@@ -4,6 +4,7 @@
 
   "framework": "jasmine",
   "parallel": 4,
+  "browser_start_timeout" : 600,
   
   "on_start": {
     "command": "kill -9 $(ps -A | grep BrowserStackLocal | grep -v grep | cut -d ' ' -f2); ./scripts/browserstack-local.js &",