diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index a0245c8..f0cd47f 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -62,7 +62,7 @@ abstract class XmlaOlap4jConnection implements OlapConnection {
 
     final XmlaOlap4jProxy proxy;
 
-    private boolean closed;
+    private boolean closed = false;
 
     /**
      * URL of the HTTP server to which to send XML requests.
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index 8c2c011..5215892 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -338,7 +338,7 @@ public void testConnectionUnwrap() throws SQLException {
 
     public void testXmlaCatalogParameter() throws Exception {
         if (tester.getFlavor() == TestContext.Tester.Flavor.XMLA
-                || tester.getFlavor() != Tester.Flavor.XMLA)
+                || tester.getFlavor() == Tester.Flavor.REMOTE_XMLA)
         {
             // We won't use the tester itself since we want to test
             // creating a connection with and without a Catalog parameter.
diff --git a/testsrc/org/olap4j/MetadataTest.java b/testsrc/org/olap4j/MetadataTest.java
index 7db49d0..3b68431 100644
--- a/testsrc/org/olap4j/MetadataTest.java
+++ b/testsrc/org/olap4j/MetadataTest.java
@@ -283,7 +283,7 @@ public void testDatabaseMetaDataGetCatalogs() throws SQLException {
             CATALOGS_COLUMN_NAMES);
         final String expected;
         if (tester.getFlavor() == TestContext.Tester.Flavor.XMLA
-                || tester.getFlavor() != Tester.Flavor.REMOTE_XMLA)
+                || tester.getFlavor() == Tester.Flavor.REMOTE_XMLA)
         {
             // XMLA test uses dummy duplicate catalog to make sure that we
             // get all catalogs
@@ -302,7 +302,7 @@ public void testDatabaseMetaDataGetSchemas() throws SQLException {
             SCHEMAS_COLUMN_NAMES);
         final String expected;
         if (tester.getFlavor() == TestContext.Tester.Flavor.XMLA
-                || tester.getFlavor() != Tester.Flavor.REMOTE_XMLA)
+                || tester.getFlavor() == Tester.Flavor.REMOTE_XMLA)
         {
             // XMLA test uses dummy duplicate catalog to make sure that we
             // get all catalogs
@@ -394,7 +394,7 @@ public void testDatabaseMetaDataGetCubes() throws SQLException {
             s);
         final int lineCount2 = linecount(s);
         if (tester.getFlavor() == TestContext.Tester.Flavor.XMLA
-                || tester.getFlavor() != Tester.Flavor.REMOTE_XMLA)
+                || tester.getFlavor() == Tester.Flavor.REMOTE_XMLA)
         {
             assertEquals(lineCount * 2, lineCount2);
         }