diff --git a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java
index 3adaa2a95..d16b43e2c 100644
--- a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java
+++ b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLLister.java
@@ -20,10 +20,7 @@
 ==================================================================== */
 package org.apache.poi.dev;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
 
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -38,14 +35,14 @@ public class TestOOXMLLister {
     private static PrintStream SYSTEM_OUT;
 
     @BeforeClass
-    public static void setUp() {
+    public static void setUp() throws UnsupportedEncodingException {
         SYSTEM_OUT = System.out;
         System.setOut(new PrintStream(new OutputStream() {
             @Override
             public void write(int b) throws IOException {
 
             }
-        }));
+        }, false, "UTF-8"));
     }
 
     @AfterClass
diff --git a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLPrettyPrint.java b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLPrettyPrint.java
index 261a1575c..f18bc8828 100644
--- a/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLPrettyPrint.java
+++ b/src/ooxml/testcases/org/apache/poi/dev/TestOOXMLPrettyPrint.java
@@ -26,10 +26,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -39,14 +36,14 @@ public class TestOOXMLPrettyPrint {
     private static PrintStream SYSTEM_OUT;
 
     @BeforeClass
-    public static void setUp() {
+    public static void setUp() throws UnsupportedEncodingException {
         SYSTEM_OUT = System.out;
         System.setOut(new PrintStream(new OutputStream() {
             @Override
             public void write(int b) throws IOException {
 
             }
-        }));
+        }, false, "UTF-8"));
     }
 
     @AfterClass
diff --git a/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java b/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
index 1a2e1af60..3a1c3603f 100644
--- a/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
+++ b/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
@@ -28,13 +28,7 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
 
 import static org.junit.Assert.*;
 
@@ -42,15 +36,14 @@ public class TestPOIFSDump {
 
     private static PrintStream SYSTEM;
     @BeforeClass
-    public static void setUp() {
+    public static void setUp() throws UnsupportedEncodingException {
         SYSTEM = System.out;
         System.setOut(new PrintStream(new OutputStream() {
             @Override
             public void write(int b) throws IOException {
 
             }
-        }
-        ));
+        }, false, "UTF-8"));
     }
 
     @AfterClass
diff --git a/src/testcases/org/apache/poi/util/TestHexDump.java b/src/testcases/org/apache/poi/util/TestHexDump.java
index f196c9b6e..af3d8877b 100644
--- a/src/testcases/org/apache/poi/util/TestHexDump.java
+++ b/src/testcases/org/apache/poi/util/TestHexDump.java
@@ -22,13 +22,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,14 +33,14 @@ public class TestHexDump {
     private static PrintStream SYSTEM_OUT;
 
     @BeforeClass
-    public static void setUp() {
+    public static void setUp() throws UnsupportedEncodingException {
         SYSTEM_OUT = System.out;
         System.setOut(new PrintStream(new OutputStream() {
             @Override
             public void write(int b) throws IOException {
 
             }
-        }));
+        }, false, "UTF-8"));
     }
 
     @AfterClass