diff --git a/src/main/javascript/view/OperationView.js b/src/main/javascript/view/OperationView.js
index 6891f5a1..e4be8004 100644
--- a/src/main/javascript/view/OperationView.js
+++ b/src/main/javascript/view/OperationView.js
@@ -139,8 +139,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
         schemaObj = this.model.responses[code].schema;
         if (schemaObj && schemaObj.$ref) {
           schema = schemaObj.$ref;
-          if (schema.indexOf('#/definitions/') === 0) {
-            schema = schema.substring('#/definitions/'.length);
+          if (schema.indexOf('#/definitions/') !== -1) {
+            schema = schema.replace(/^.*#\/definitions\//, '');
           }
         }
         this.model.responseMessages.push({
diff --git a/test/e2e/servers.js b/test/e2e/servers.js
index 58cbb08e..4e4d1976 100644
--- a/test/e2e/servers.js
+++ b/test/e2e/servers.js
@@ -29,7 +29,7 @@ module.exports.start = function (specsLocation, done) {
   setTimeout(function(){
     driver.get(url);
     done();
-  }, process.env.TRAVIS ? 20000 : 3000);
+  }, process.env.TRAVIS ? 20000 : 5000);
 };
 
 module.exports.close = function() {
diff --git a/test/e2e/v1.js b/test/e2e/v1.js
index 142129f2..32f1b6e8 100644
--- a/test/e2e/v1.js
+++ b/test/e2e/v1.js
@@ -4,6 +4,7 @@ var expect = require('chai').expect;
 var driver = require('./driver');
 var servers = require('./servers');
 var webdriver = require('selenium-webdriver');
+var until = webdriver.until;
 
 var elements = [
   'swagger-ui-container',
@@ -39,12 +40,8 @@ describe('swagger 1.x spec tests', function () {
     });
   });
 
-  it('should have "Swagger UI" in title', function (done) {
-    driver.sleep(200);
-    driver.getTitle().then(function(title) {
-      expect(title).to.contain('Swagger UI');
-      done();
-    });
+  it('should have "Swagger UI" in title', function () {
+    return driver.wait(until.titleIs('Swagger UI'), 1000);
   });
 
   elements.forEach(function (id) {
@@ -102,4 +99,4 @@ describe('swagger 1.x spec tests', function () {
   after(function(){
     servers.close();
   });
-});
\ No newline at end of file
+});
diff --git a/test/e2e/v2.js b/test/e2e/v2.js
index 8e508cc3..e0515b35 100644
--- a/test/e2e/v2.js
+++ b/test/e2e/v2.js
@@ -4,7 +4,7 @@ var expect = require('chai').expect;
 var webdriver = require('selenium-webdriver');
 var driver = require('./driver');
 var servers = require('./servers');
-
+var until = webdriver.until;
 
 var elements = [
   'swagger-ui-container',
@@ -40,12 +40,8 @@ describe('swagger 2.0 spec tests', function () {
     });
   });
 
-  it('should have "Swagger UI" in title', function (done) {
-    driver.sleep(200);
-    driver.getTitle().then(function(title) {
-      expect(title).to.contain('Swagger UI');
-      done();
-    });
+  it('should have "Swagger UI" in title', function () {
+    return driver.wait(until.titleIs('Swagger UI'), 1000);
   });
 
   elements.forEach(function (id) {
@@ -117,4 +113,4 @@ describe('swagger 2.0 spec tests', function () {
   after(function() {
     servers.close();
   });
-});
\ No newline at end of file
+});