diff --git a/rados/pom.xml b/rados/pom.xml
index 89ba1d0f70977c453ab396f0f34b39dcf47a8fb6..93e5cdb5c24ec4ac6ea6ce698a668a1b3fcc3a98 100644
--- a/rados/pom.xml
+++ b/rados/pom.xml
@@ -47,22 +47,17 @@ LICENSE file.
   		<version>${json.version}</version>
   	</dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.1.1</version>
-      <scope>test</scope>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>4.2.2</version>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-      <version>4.2.2</version>
-    </dependency>
   </dependencies>
 
   <properties>
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 af72643a5909d61bae2b279b22d37a33c016343e..b77923a6c232fad0611dc74f647823210f2d4161 100644
--- a/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
+++ b/rados/src/test/java/com/yahoo/ycsb/db/RadosClientTest.java
@@ -17,8 +17,7 @@
 
 package com.yahoo.ycsb.db;
 
-import static org.testng.AssertJUnit.assertEquals;
-
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeNoException;
 
 import com.yahoo.ycsb.ByteIterator;
@@ -26,11 +25,11 @@ 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 org.junit.AfterClass;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -71,7 +70,7 @@ public class RadosClientTest {
   }
 
   @BeforeClass
-  public void setupClass() throws DBException {
+  public static void setupClass() throws DBException {
     radosclient = new RadosClient();
 
     Properties p = new Properties();
@@ -93,12 +92,12 @@ public class RadosClientTest {
     }
   }
 
-  @BeforeMethod
+  @Before
   public void setUp() {
     radosclient.insert(TABLE_NAME, KEY0, DATA);
   }
 
-  @AfterMethod
+  @After
   public void tearDown() {
     radosclient.delete(TABLE_NAME, KEY0);
   }