diff --git a/hdfs/CHANGES.txt b/hdfs/CHANGES.txt
index 02c8864284..f6bb3de04d 100644
--- a/hdfs/CHANGES.txt
+++ b/hdfs/CHANGES.txt
@@ -663,6 +663,8 @@ Trunk (unreleased changes)
     HDFS-2237. Change UnderReplicatedBlocks from public to package private.
     (szetszwo)
 
+    HDFS-2233. Add WebUI tests with URI reserved chars. (eli)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
diff --git a/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeJsp.java b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeJsp.java
index 009d03d765..eb78aced85 100644
--- a/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeJsp.java
+++ b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeJsp.java
@@ -82,31 +82,22 @@ public void testViewFileJsp() throws IOException {
     try {
       cluster = new MiniDFSCluster.Builder(CONF).build();
       cluster.waitActive();
-      
-      testViewingFile(cluster, "/test-file", false);
-      testViewingFile(cluster, "/tmp/test-file", false);
-      testViewingFile(cluster, "/tmp/test-file%with goofy&characters", false);
-      
-      testViewingFile(cluster, "/test-file", true);
-      testViewingFile(cluster, "/tmp/test-file", true);
-      testViewingFile(cluster, "/tmp/test-file%with goofy&characters", true);
-
-      testViewingFile(cluster, "/foo bar", true);
-      testViewingFile(cluster, "/foo+bar", true);
-      testViewingFile(cluster, "/foo;bar", true);
-      testViewingFile(cluster, "/foo=bar", true);
-      testViewingFile(cluster, "/foo,bar", true);
-      testViewingFile(cluster, "/foo?bar", true);
-      testViewingFile(cluster, "/foo\">bar", true);
-      
-      testViewingFile(cluster, "/foo bar", false);
-      // See HDFS-2233
-      //testViewingFile(cluster, "/foo+bar", false);
-      //testViewingFile(cluster, "/foo;bar", false);
-      testViewingFile(cluster, "/foo=bar", false);
-      testViewingFile(cluster, "/foo,bar", false);
-      testViewingFile(cluster, "/foo?bar", false);
-      testViewingFile(cluster, "/foo\">bar", false);
+      String paths[] = {
+        "/test-file",
+        "/tmp/test-file",
+        "/tmp/test-file%with goofy&characters",
+        "/foo bar/foo bar",
+        "/foo+bar/foo+bar",
+        "/foo;bar/foo;bar",
+        "/foo=bar/foo=bar",
+        "/foo,bar/foo,bar",
+        "/foo?bar/foo?bar",
+        "/foo\">bar/foo\">bar"
+      };
+      for (String p : paths) {
+        testViewingFile(cluster, p, false);
+        testViewingFile(cluster, p, true);
+      }
     } finally {
       if (cluster != null) {
         cluster.shutdown();