diff --git a/core/src/main/java/tachyon/UserInfo.java b/core/src/main/java/tachyon/UserInfo.java
index ab91f4f12b24..998b84e7f5de 100644
--- a/core/src/main/java/tachyon/UserInfo.java
+++ b/core/src/main/java/tachyon/UserInfo.java
@@ -17,8 +17,6 @@
 
 import com.google.common.base.Preconditions;
 
-import tachyon.conf.TachyonConf;
-
 /**
  * Represent one user in the worker daemon.
  */
diff --git a/core/src/main/java/tachyon/conf/TachyonConf.java b/core/src/main/java/tachyon/conf/TachyonConf.java
index 4bd2a8322d5f..d7c237ae110b 100644
--- a/core/src/main/java/tachyon/conf/TachyonConf.java
+++ b/core/src/main/java/tachyon/conf/TachyonConf.java
@@ -323,7 +323,7 @@ public long getBytes(String key, long defaultValue) {
 
   public Map<String, String> toMap() {
     Map<String, String> copy = new HashMap<String, String>();
-    for (Enumeration names = mProperties.propertyNames(); names.hasMoreElements();) {
+    for (Enumeration<?> names = mProperties.propertyNames(); names.hasMoreElements();) {
       Object key = names.nextElement();
       copy.put(key.toString(), mProperties.get(key).toString());
     }
diff --git a/core/src/main/java/tachyon/worker/TachyonWorker.java b/core/src/main/java/tachyon/worker/TachyonWorker.java
index f93f8d8d7699..6333b865b042 100644
--- a/core/src/main/java/tachyon/worker/TachyonWorker.java
+++ b/core/src/main/java/tachyon/worker/TachyonWorker.java
@@ -21,7 +21,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.google.common.primitives.Ints;
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TThreadedSelectorServer;
 import org.apache.thrift.transport.TNonblockingServerSocket;
diff --git a/core/src/main/java/tachyon/worker/netty/DataServerHandler.java b/core/src/main/java/tachyon/worker/netty/DataServerHandler.java
index 7d352db7c08c..7fe34c7d8856 100644
--- a/core/src/main/java/tachyon/worker/netty/DataServerHandler.java
+++ b/core/src/main/java/tachyon/worker/netty/DataServerHandler.java
@@ -15,7 +15,6 @@
 
 package tachyon.worker.netty;
 
-
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandler;
@@ -27,7 +26,6 @@
 
 import tachyon.Constants;
 import tachyon.conf.TachyonConf;
-import tachyon.util.CommonUtils;
 import tachyon.worker.BlockHandler;
 import tachyon.worker.BlocksLocker;
 import tachyon.worker.hierarchy.StorageDir;
diff --git a/core/src/test/java/tachyon/TachyonURITest.java b/core/src/test/java/tachyon/TachyonURITest.java
index be24ceba3726..8198cf28e6f9 100644
--- a/core/src/test/java/tachyon/TachyonURITest.java
+++ b/core/src/test/java/tachyon/TachyonURITest.java
@@ -14,8 +14,7 @@
  */
 package tachyon;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -341,11 +340,11 @@ public void joinTests() {
     Assert.assertEquals(new TachyonURI("C:\\\\a\\b"),
         new TachyonURI("C:\\\\a").join(new TachyonURI("\\b")));
 
-    final String pathWithSpecialChar = "×ö,ßbÁ»$o\u0005ÉÆ[\u000F| \u009E=BÕ½";
+    final String pathWithSpecialChar = "����,��b����$o\u0005����[\u000F| \u009E=B����";
     Assert.assertEquals(new TachyonURI("/" + pathWithSpecialChar),
             new TachyonURI("/").join(pathWithSpecialChar));
 
-    final String pathWithSpecialCharAndColon = "×ö,ßbÁ»$o\u0005ÉÆ[\u000F| \u009E=BÕ:½";
+    final String pathWithSpecialCharAndColon = "����,��b����$o\u0005����[\u000F| \u009E=B��:��";
     Assert.assertEquals(new TachyonURI("/" + pathWithSpecialCharAndColon),
             new TachyonURI("/").join(pathWithSpecialCharAndColon));
   }
diff --git a/core/src/test/java/tachyon/UserInfoTest.java b/core/src/test/java/tachyon/UserInfoTest.java
index d5dd026785ec..79efc5a374a4 100644
--- a/core/src/test/java/tachyon/UserInfoTest.java
+++ b/core/src/test/java/tachyon/UserInfoTest.java
@@ -16,7 +16,6 @@
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import tachyon.conf.TachyonConf;
diff --git a/core/src/test/java/tachyon/client/LocalBlockInStreamTest.java b/core/src/test/java/tachyon/client/LocalBlockInStreamTest.java
index 04d1f07a88b8..f6dfbc2f10c8 100644
--- a/core/src/test/java/tachyon/client/LocalBlockInStreamTest.java
+++ b/core/src/test/java/tachyon/client/LocalBlockInStreamTest.java
@@ -27,7 +27,6 @@
 
 import tachyon.Constants;
 import tachyon.TestUtils;
-import tachyon.conf.TachyonConf;
 import tachyon.master.LocalTachyonCluster;
 
 /**
diff --git a/core/src/test/java/tachyon/client/TachyonFileTest.java b/core/src/test/java/tachyon/client/TachyonFileTest.java
index a8797b00719c..af507f95e406 100644
--- a/core/src/test/java/tachyon/client/TachyonFileTest.java
+++ b/core/src/test/java/tachyon/client/TachyonFileTest.java
@@ -17,9 +17,8 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import junit.framework.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/core/src/test/java/tachyon/client/table/RawColumnTest.java b/core/src/test/java/tachyon/client/table/RawColumnTest.java
index a27fa538bcf5..592d9e79974d 100644
--- a/core/src/test/java/tachyon/client/table/RawColumnTest.java
+++ b/core/src/test/java/tachyon/client/table/RawColumnTest.java
@@ -16,10 +16,9 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
 import org.apache.thrift.TException;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/core/src/test/java/tachyon/client/table/RawTableTest.java b/core/src/test/java/tachyon/client/table/RawTableTest.java
index 74af30ec1f96..0da8011b9888 100644
--- a/core/src/test/java/tachyon/client/table/RawTableTest.java
+++ b/core/src/test/java/tachyon/client/table/RawTableTest.java
@@ -17,9 +17,8 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import junit.framework.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -31,7 +30,6 @@
 import tachyon.client.TachyonFile;
 import tachyon.client.TachyonFS;
 import tachyon.client.WriteType;
-import tachyon.conf.TachyonConf;
 import tachyon.master.LocalTachyonCluster;
 
 /**
diff --git a/core/src/test/java/tachyon/command/UtilsTest.java b/core/src/test/java/tachyon/command/UtilsTest.java
index 51d5002583b9..0fb75e55121b 100644
--- a/core/src/test/java/tachyon/command/UtilsTest.java
+++ b/core/src/test/java/tachyon/command/UtilsTest.java
@@ -16,8 +16,7 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import tachyon.Constants;
diff --git a/core/src/test/java/tachyon/master/EditLogOperationTest.java b/core/src/test/java/tachyon/master/EditLogOperationTest.java
index fc94d9812703..151bc1a772ba 100644
--- a/core/src/test/java/tachyon/master/EditLogOperationTest.java
+++ b/core/src/test/java/tachyon/master/EditLogOperationTest.java
@@ -18,9 +18,8 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.commons.codec.binary.Base64;
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/core/src/test/java/tachyon/master/JournalTest.java b/core/src/test/java/tachyon/master/JournalTest.java
index c458b34547d5..ed3b63d99e9f 100644
--- a/core/src/test/java/tachyon/master/JournalTest.java
+++ b/core/src/test/java/tachyon/master/JournalTest.java
@@ -20,9 +20,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import junit.framework.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/core/src/test/java/tachyon/master/MasterClientTest.java b/core/src/test/java/tachyon/master/MasterClientTest.java
index cebbbb52ef99..02ec1d92ef13 100644
--- a/core/src/test/java/tachyon/master/MasterClientTest.java
+++ b/core/src/test/java/tachyon/master/MasterClientTest.java
@@ -19,10 +19,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import junit.framework.Assert;
-
 import org.apache.thrift.TException;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/core/src/test/java/tachyon/master/MasterFaultToleranceTest.java b/core/src/test/java/tachyon/master/MasterFaultToleranceTest.java
index 635c12a42763..9412d270af69 100644
--- a/core/src/test/java/tachyon/master/MasterFaultToleranceTest.java
+++ b/core/src/test/java/tachyon/master/MasterFaultToleranceTest.java
@@ -18,9 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;