diff --git a/src/org/olap4j/impl/Bug.java b/src/org/olap4j/impl/Bug.java
index d1f1321..35340e6 100644
--- a/src/org/olap4j/impl/Bug.java
+++ b/src/org/olap4j/impl/Bug.java
@@ -52,6 +52,14 @@ public abstract class Bug {
      * is fixed.
      */
     public static final boolean BugOlap4j3106220Fixed = false;
+
+    /**
+     * Whether
+     * <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3126853&group_id=168953&atid=848534">bug 3126853,
+     * "ConnectionTest.testCellSetBug hangs"</a>
+     * is fixed.
+     */
+    public static final boolean BugOlap4j3126853Fixed = false;
 }
 
 // End Bug.java
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index 8392a5a..ba817f2 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -11,6 +11,7 @@
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
+import org.olap4j.impl.Bug;
 import org.olap4j.impl.Olap4jUtil;
 import org.olap4j.driver.xmla.*;
 import org.olap4j.mdx.*;
@@ -2467,6 +2468,9 @@ public void testStatementTimeout() throws Throwable {
     }
 
     public void testCellSetBug() throws SQLException {
+        if (!Bug.BugOlap4j3126553Fixed) {
+            return;
+        }
         connection = tester.createConnection();
         OlapConnection olapConnection =
             tester.getWrapper().unwrap(connection, OlapConnection.class);