diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 55c0de6178..2a38c57bb0 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -1774,7 +1774,7 @@
     <dependency>
       <groupId>com.allen-sauer.gwt.log</groupId>
       <artifactId>gwt-log</artifactId>
-      <version>3.2.1</version>
+      <version>3.1.8</version>
     </dependency>
 
     <dependency>
diff --git a/zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java b/zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
new file mode 100644
index 0000000000..674684752e
--- /dev/null
+++ b/zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
@@ -0,0 +1,15 @@
+package com.google.gwt.core.client;
+
+/**
+ * After upgrade to GWT 2.5, some of the gwt related libraries start to break.
+ * i.e. gwt-log see http://code.google.com/p/gwt-log/issues/detail?id=70
+ * <p/>
+ * Basically the libraries still reference com.google.gwt.core.client.GWTBridge
+ * and it's been moved to com.google.gwt.core.shared in GWT 2.5. Before they
+ * release new version this class needs to be in class path to make things work.
+ *
+ * @author Patrick Huang <a
+ *         href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
+ */
+public abstract class GWTBridge extends com.google.gwt.core.shared.GWTBridge {
+}