diff --git a/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java b/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
index 42f62c063..1bcaf0099 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/AddOwnerIT.java
@@ -6,7 +6,6 @@ import org.junit.experimental.categories.Category;
 import org.openqa.selenium.By;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.Select;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 import java.net.MalformedURLException;
 
@@ -31,17 +30,17 @@ public class AddOwnerIT extends SeleniumBaseIT {
         fillTextField(By.name("city"), "Enschede");
         fillTextField(By.name("telephone"), "0534890000");
         driver.findElement(By.name("telephone")).submit();
+        waitForPageToLoad();
         Assert.assertTrue(pageContainsText("Sophie Lathouwers"));
 
         //Add a pet
-        new WebDriverWait(driver, 3).until(ExpectedConditions.presenceOfAllElementsLocatedBy(By.linkText("Add New Pet")));
+        waitFor(ExpectedConditions.presenceOfAllElementsLocatedBy(By.linkText("Add New Pet")));
         driver.findElement(By.linkText("Add New Pet")).click();
         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();
 
-        waitFor(new FixedPeriod(1000));
         waitForPageToLoad();
         Assert.assertTrue("Could not locate \"Thumper\" on the page. This is the html of the current page: "+getHTML(),pageContainsText("Thumper"));
         setTestFinished();
diff --git a/src/test/java/nl/utwente/bpsd/selenium/AddVisitIT.java b/src/test/java/nl/utwente/bpsd/selenium/AddVisitIT.java
index 864ae7103..82c2889a1 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/AddVisitIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/AddVisitIT.java
@@ -24,13 +24,13 @@ public class AddVisitIT extends SeleniumBaseIT {
         driver.get(BASE_URL+"/owners/find");
 
         driver.findElement(By.name("lastName")).submit();
-        waitFor(new FixedPeriod(1000));
         waitForPageToLoad();
 
         //Go to first owner
         WebElement table = driver.findElement(By.tagName("table"));
         List<WebElement> cells = table.findElements(By.xpath(".//tr/td"));
         cells.get(0).findElement(By.xpath("a")).click();
+        waitForPageToLoad();
 
         //Go to edit page of first pet
         driver.findElement(By.xpath("//table//tr/td/table/tbody//a[contains(text(),'Edit')]")).click();
@@ -39,7 +39,6 @@ public class AddVisitIT extends SeleniumBaseIT {
         fillTextField(By.name("name"), "foobar");
         driver.findElement(By.name("name")).submit();
 
-        waitFor(new FixedPeriod(1000));
         waitForPageToLoad();
         Assert.assertNotNull(driver.findElement(By.xpath("//table//tr/td/dl/dd[contains(text(), 'foobar')]")));
 
diff --git a/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java b/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
index 45050f1ab..57da781d9 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/FindOwnerIT.java
@@ -23,7 +23,6 @@ public class FindOwnerIT extends SeleniumBaseIT {
         driver.get(BASE_URL+"/owners/find");
         fillTextField(By.name("lastName"),"Coleman");
         driver.findElement(By.name("lastName")).submit();
-        waitFor(new FixedPeriod(1000));
         waitForPageToLoad();
         Assert.assertTrue("Could not find \"Jean Coleman\" on the current page. This is the html of the current page: "+getHTML(),driver.findElements(By.xpath("//*[text()='Jean Coleman']")).size() == 1);
         setTestFinished();
diff --git a/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java b/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
index 0cf386804..333b62d5a 100644
--- a/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
+++ b/src/test/java/nl/utwente/bpsd/selenium/SeleniumBaseIT.java
@@ -62,10 +62,11 @@ public class SeleniumBaseIT {
     }
 
     protected void waitForPageToLoad() {
+        waitFor(new FixedPeriod(333));
         waitFor(new PageLoadedExpectedCondition());
     }
 
-    protected void waitFor(ExpectedCondition<Boolean> condition) {
+    protected void waitFor(ExpectedCondition<?> condition) {
         new WebDriverWait(driver, 3).until(condition);
     }