diff --git a/rados/pom.xml b/rados/pom.xml
index c25bccef..5a79ae64 100644
--- a/rados/pom.xml
+++ b/rados/pom.xml
@@ -1,61 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (c) 2016 YCSB contributors. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License. You
 may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 implied. See the License for the specific language governing
 permissions and limitations under the License. See accompanying
 LICENSE file.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.yahoo.ycsb</groupId>
     <artifactId>binding-parent</artifactId>
     <version>0.9.0-SNAPSHOT</version>
     <relativePath>../binding-parent</relativePath>
   </parent>
 
   <artifactId>rados-binding</artifactId>
   <name>rados of Ceph FS binding</name>
   <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
       <groupId>com.ceph</groupId>
       <artifactId>rados</artifactId>
       <version>${rados.version}</version>
     </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>
       <artifactId>core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
 	    <groupId>org.json</groupId>
   		<artifactId>json</artifactId>
   		<version>${json.version}</version>
   	</dependency>
     <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <version>6.1.1</version>
-        <scope>test</scope>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <properties>
   	<rados.version>0.2.0</rados.version>
   	<json.version>20160212</json.version>
   </properties>
 </project>
diff --git a/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java b/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
index f6dadd96..52b86c5d 100644
--- a/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
+++ b/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
@@ -1,144 +1,151 @@
 /**
  * Copyright (c) 2016 YCSB contributors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You
  * may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  * implied. See the License for the specific language governing
  * permissions and limitations under the License. See accompanying
  * LICENSE file.
  */
 
 package com.yahoo.ycsb.db;
 
 import static org.testng.AssertJUnit.assertEquals;
 
+import static org.junit.Assume.assumeNoException;
+
 import com.yahoo.ycsb.ByteIterator;
 import com.yahoo.ycsb.DBException;
 import com.yahoo.ycsb.Status;
 import com.yahoo.ycsb.StringByteIterator;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
 
 
  /**
   * Test for the binding of <a href="http://ceph.org/">RADOS of Ceph</a>.
   *
   * See {@code rados/README.md} for details.
   */
 
 public class RadosClientTest {
 
   private static RadosClient radosclient;
 
   public static final String POOL_PROPERTY = "rados.pool";
   public static final String POOL_TEST = "rbd";
 
   private static final String TABLE_NAME = "table0";
   private static final String KEY0 = "key0";
   private static final String KEY1 = "key1";
   private static final String KEY2 = "key2";
   private static final HashMap<String, ByteIterator> DATA;
   private static final HashMap<String, ByteIterator> DATA_UPDATED;
 
   static {
     DATA = new HashMap<String, ByteIterator>(10);
     DATA_UPDATED = new HashMap<String, ByteIterator>(10);
     for (int i = 0; i < 10; i++) {
       String key = "key" + UUID.randomUUID();
       DATA.put(key, new StringByteIterator("data" + UUID.randomUUID()));
       DATA_UPDATED.put(key, new StringByteIterator("data" + UUID.randomUUID()));
     }
   }
 
   @BeforeClass
   public void setupClass() throws DBException {
     radosclient = new RadosClient();
 
     Properties p = new Properties();
     p.setProperty(POOL_PROPERTY, POOL_TEST);
 
-    radosclient.setProperties(p);
-    radosclient.init();
+    try {
+      radosclient.setProperties(p);
+      radosclient.init();
+    }
+    catch (DBException e) {
+      assumeNoException("Ceph cluster is not running. Skipping tests.", e);
+    }
   }
 
   @AfterClass
   public void teardownClass() throws DBException {
     if (radosclient != null) {
       radosclient.cleanup();
     }
   }
 
   @BeforeMethod
   public void setUp() {
     radosclient.insert(TABLE_NAME, KEY0, DATA);
   }
 
   @AfterMethod
   public void tearDown() {
     radosclient.delete(TABLE_NAME, KEY0);
   }
 
   @Test
   public void insertTest() {
     Status result = radosclient.insert(TABLE_NAME, KEY1, DATA);
     assertEquals(Status.OK, result);
   }
 
   @Test
   public void updateTest() {
     radosclient.insert(TABLE_NAME, KEY2, DATA);
 
     Status result = radosclient.update(TABLE_NAME, KEY2, DATA_UPDATED);
     assertEquals(Status.OK, result);
 
     HashMap<String, ByteIterator> ret = new HashMap<String, ByteIterator>(10);
     radosclient.read(TABLE_NAME, KEY2, DATA.keySet(), ret);
     compareMap(DATA_UPDATED, ret);
 
     radosclient.delete(TABLE_NAME, KEY2);
   }
 
   @Test
   public void readTest() {
     HashMap<String, ByteIterator> ret = new HashMap<String, ByteIterator>(10);
     Status result = radosclient.read(TABLE_NAME, KEY0, DATA.keySet(), ret);
     assertEquals(Status.OK, result);
     compareMap(DATA, ret);
   }
 
   private void compareMap(HashMap<String, ByteIterator> src, HashMap<String, ByteIterator> dest) {
     assertEquals(src.size(), dest.size());
 
     Set setSrc = src.entrySet();
     Iterator<Map.Entry> itSrc = setSrc.iterator();
     for (int i = 0; i < 10; i++) {
       Map.Entry<String, ByteIterator> entrySrc = itSrc.next();
       assertEquals(entrySrc.getValue().toString(), dest.get(entrySrc.getKey()).toString());
     }
   }
 
   @Test
   public void deleteTest() {
     Status result = radosclient.delete(TABLE_NAME, KEY0);
     assertEquals(Status.OK, result);
   }
 
 }