2 files changed, 9 insertions, 4 deletions
diff --git a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
index d04413f06f..26bbe151d2 100644
--- a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
@@ -201,6 +201,11 @@ public class TestFileUtils
      */
     public static void copy(InputStream in, File dst) throws IOException
     {
+        if(in == null)
+        {
+            throw new IllegalArgumentException("Provided InputStream must not be null");
+        }
+
         try
         {
             if (!dst.exists())
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
index e07c0ecbe9..cc95afafa2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
@@ -30,7 +30,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Properties;
 
@@ -56,9 +56,9 @@ public class UTF8Test extends QpidBrokerTestCase
 
     private void invoke(String name) throws Exception
     {
-        String path = System.getProperties().getProperty("QPID_HOME");
-        path = path + "/../systests/src/main/java/org/apache/qpid/test/unit/message/" + name;
-         BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF8"));
+        InputStream stream = getClass().getClassLoader().getResourceAsStream("org/apache/qpid/test/unit/message/" + name);
+
+        BufferedReader in = new BufferedReader(new InputStreamReader(stream, "UTF8"));
         runTest(in.readLine(), in.readLine(), in.readLine(), in.readLine());
         in.close();
     }