diff --git a/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java b/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
index de1dfaba9..ce1573a39 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
@@ -31,16 +31,19 @@ public class AddOwnerIT extends SeleniumBaseIT {
         fillTextField(By.name("city"), "Enschede");
         fillTextField(By.name("telephone"), "0534890000");
         driver.findElement(By.name("telephone")).submit();
+        new WebDriverWait(driver, 5).until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[text()='Owner Information']")));
         Assert.assertTrue(pageContainsText("Sophie Lathouwers"));
 
         //Add a pet
-        new WebDriverWait(driver, 3).until(ExpectedConditions.presenceOfAllElementsLocatedBy(By.linkText("Add New Pet")));
-        driver.findElement(By.linkText("Add New Pet")).click();
+        new WebDriverWait(driver, 5).until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[text()='Pets and Visits']")));
+        driver.findElements(By.className("btn")).get(1).click();
+        new WebDriverWait(driver, 5).until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[text()='New']")));
         fillTextField(By.name("name"), "Thumper");
         fillTextField(By.name("birthDate"), "1942/08/09");
         new Select(driver.findElement(By.name("type"))).selectByValue("hamster");
         driver.findElement(By.name("name")).submit();
 
+        new WebDriverWait(driver, 5).until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[text()='Pets and Visits']")));
         Assert.assertTrue(pageContainsText("Thumper"));
     }
 
diff --git a/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java b/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
index 17fcd7de4..ac52cde29 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
@@ -4,6 +4,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.openqa.selenium.By;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
 
 import java.net.MalformedURLException;
 
@@ -23,6 +25,7 @@ public class FindOwnerIT extends SeleniumBaseIT {
         driver.get(BASE_URL+"/owners/find");
         fillTextField(By.name("lastName"),"Coleman");
         driver.findElement(By.name("lastName")).submit();
+        new WebDriverWait(driver, 5).until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[text()='Owner Information']")));
         Assert.assertTrue(driver.findElementsByXPath("//*[text()='Jean Coleman']").size() == 1);
     }
 }
diff --git a/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java b/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
index d4f701966..02ae4c59d 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
@@ -22,7 +22,7 @@ public class SeleniumBaseIT {
     public SeleniumBaseIT() throws MalformedURLException {
 //		System.setProperty("webdriver.chrome.driver","C:\\Users\\marti\\Downloads\\chromedriver_win32\\chromedriver.exe");
 //        this.driver = new ChromeDriver();
-        this.driver = new RemoteWebDriver(new URL("http://selenium:4444/wd/hub"), DesiredCapabilities.firefox());
+        this.driver = new RemoteWebDriver(new URL("http://localhost:4444/wd/hub"), DesiredCapabilities.firefox());
         driver.get(BASE_URL);
     }