diff --git a/src/app/ui/universal-dapp-ui.js b/src/app/ui/universal-dapp-ui.js
index df2b3651a7..b2d289f5cf 100644
--- a/src/app/ui/universal-dapp-ui.js
+++ b/src/app/ui/universal-dapp-ui.js
@@ -54,7 +54,7 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
   let self = this
   address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex')
   address = ethJSUtil.toChecksumAddress(address)
-  var instance = yo`<div class="instance run-instance border-dark ${css.instance} ${css.hidesub}" id="instance${address}"></div>`
+  var instance = yo`<div class="instance run-instance border-dark ${css.instance} ${css.hidesub}" id="instance${address}" data-shared="universalDappUiInstance"></div>`
   const context = this.blockchain.context()
 
   var shortAddress = helper.shortenAddress(address)
diff --git a/test-browser/commands/getAddressAtPosition.js b/test-browser/commands/getAddressAtPosition.js
index 43b7689ce1..b0af766747 100644
--- a/test-browser/commands/getAddressAtPosition.js
+++ b/test-browser/commands/getAddressAtPosition.js
@@ -14,9 +14,12 @@ class GetAddressAtPosition extends EventEmitter {
 }
 
 function getAddressAtPosition (browser, index, callback) {
-  index = index + 2
-  browser.execute(function (index) {
-    return document.querySelector('.instance:nth-of-type(' + index + ')').getAttribute('id').replace('instance', '')
+  browser.waitForElementPresent('*[data-shared="universalDappUiInstance"]')
+  .execute(function (index) {
+    const deployedContracts = document.querySelectorAll('*[data-shared="universalDappUiInstance"]')
+    const id = deployedContracts[index].getAttribute('id')
+
+    return id.replace('instance', '')
   }, [index], function (result) {
     callback(result.value)
   })
diff --git a/test-browser/helpers/init.js b/test-browser/helpers/init.js
index c7829c367a..101995b031 100644
--- a/test-browser/helpers/init.js
+++ b/test-browser/helpers/init.js
@@ -22,7 +22,7 @@ module.exports = function (browser, callback, url, preloadPlugins = true) {
 }
 
 function initModules (browser, callback) {
-  browser.pause(5000)
+  browser.pause(20000)
     .click('#icon-panel div[plugin="pluginManager"]')
     .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_solidity"] button')
     .pause(5000)
diff --git a/test-browser/tests/libraryDeployment.js b/test-browser/tests/libraryDeployment.js
index 98cf2e3904..eccea3d6bf 100644
--- a/test-browser/tests/libraryDeployment.js
+++ b/test-browser/tests/libraryDeployment.js
@@ -52,6 +52,7 @@ module.exports = {
               })
             })
           })
+          .end()
   },
   tearDown: sauce
 }