diff --git a/functional-test/src/main/java/org/zanata/util/WebDriverLogWait.java b/functional-test/src/main/java/org/zanata/util/WebDriverLogWait.java
new file mode 100644
index 0000000000..25b0e3e89f
--- /dev/null
+++ b/functional-test/src/main/java/org/zanata/util/WebDriverLogWait.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.zanata.util;
+
+import com.google.common.base.Function;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.zanata.page.WebDriverFactory;
+
+/**
+ * Modifies WebDriverWait to check JavaScript logs and errors before each
+ * invocation of the test function (typically every 500ms).
+ * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
+ */
+public class WebDriverLogWait extends WebDriverWait {
+    private final WebDriverFactory factory;
+
+    public WebDriverLogWait(WebDriverFactory factory,
+            long timeOutInSeconds) {
+        super(factory.getDriver(), timeOutInSeconds);
+        this.factory = factory;
+    }
+
+    @Override
+    public <V> V until(Function<? super WebDriver, V> isTruthy) {
+        return super.until((Function<? super WebDriver, V>)
+                driver -> {
+                    factory.logLogs();
+                    return isTruthy.apply(driver);
+                });
+    }
+}
diff --git a/functional-test/src/main/java/org/zanata/util/WebElementUtil.java b/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
index 49a56fb411..bd17968edd 100644
--- a/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
+++ b/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
@@ -147,7 +147,8 @@ public List<String> apply(@Nullable TableRow from) {
 
     public static FluentWait<WebDriver> waitForSeconds(WebDriver webDriver,
             int durationInSec) {
-        return new WebDriverWait(webDriver, durationInSec).ignoring(
+        return new WebDriverLogWait(WebDriverFactory.INSTANCE, durationInSec)
+                .ignoring(
                         // TODO is ignoring this safe?
                         StaleElementReferenceException.class);
     }