diff --git a/CHANGES.md b/CHANGES.md
index 65d24814..db09a463 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+1.1.5
+-----
+* [Removed direct reference to Unix TMP-path](https://github.com/iipc/webarchive-commons/issues/2)
+
 1.1.4
 -----
 * [All dates should be independent of locale settings](https://github.com/iipc/webarchive-commons/pull/22)
diff --git a/src/test/java/org/archive/format/gzip/GZIPMemberWriterTest.java b/src/test/java/org/archive/format/gzip/GZIPMemberWriterTest.java
index 5cd75ccf..483d2baf 100644
--- a/src/test/java/org/archive/format/gzip/GZIPMemberWriterTest.java
+++ b/src/test/java/org/archive/format/gzip/GZIPMemberWriterTest.java
@@ -12,8 +12,8 @@
 public class GZIPMemberWriterTest extends TestCase {
 
 	public void testWrite() throws IOException {
-		String outPath = "/tmp/tmp.gz";
-		GZIPMemberWriter gzw = new GZIPMemberWriter(new FileOutputStream(new File(outPath)));
+                File outFile = File.createTempFile("tmp", ".gz");
+		GZIPMemberWriter gzw = new GZIPMemberWriter(new FileOutputStream(outFile));
 		gzw.write(new ByteArrayInputStream("Here is record 1".getBytes(IAUtils.UTF8)));
 		gzw.write(new ByteArrayInputStream("Here is record 2".getBytes(IAUtils.UTF8)));
 	}
diff --git a/src/test/java/org/archive/net/PublicSuffixesTest.java b/src/test/java/org/archive/net/PublicSuffixesTest.java
index b88acb6d..7528bbe1 100644
--- a/src/test/java/org/archive/net/PublicSuffixesTest.java
+++ b/src/test/java/org/archive/net/PublicSuffixesTest.java
@@ -36,6 +36,7 @@
  */
 public class PublicSuffixesTest extends TestCase {
     // test of low level implementation
+    private final String NL = System.lineSeparator();
     
     public void testCompare() {
         Node n = new Node("hoge");
@@ -78,27 +79,26 @@ public void testTrie1()  {
         Node alt = new Node(null, new ArrayList<Node>());
         alt.addBranch("ac,");
         // specifically, should not have empty string as match.
-        assertEquals("(null)\n" +
-                "  \"ac,\"\n", dump(alt));
+        assertEquals("(null)" + NL + "  \"ac,\"" + NL, dump(alt));
         alt.addBranch("ac,com,");
-        assertEquals("(null)\n" +
-        		"  \"ac,\"\n" +
-        		"    \"com,\"\n" +
-        		"    \"\"\n", dump(alt));
+        assertEquals("(null)" + NL +
+        		"  \"ac,\"" + NL +
+        		"    \"com,\"" + NL +
+        		"    \"\"" + NL, dump(alt));
         alt.addBranch("ac,edu,");
-        assertEquals("(null)\n" +
-        		"  \"ac,\"\n" +
-        		"    \"com,\"\n" +
-        		"    \"edu,\"\n" +
-        		"    \"\"\n", dump(alt));
+        assertEquals("(null)" + NL +
+        		"  \"ac,\"" + NL +
+        		"    \"com,\"" + NL +
+        		"    \"edu,\"" + NL +
+        		"    \"\"" + NL, dump(alt));
     }
     public void testTrie2() {
         Node alt = new Node(null, new ArrayList<Node>());
         alt.addBranch("ac,");
         alt.addBranch("*,");
-        assertEquals("(null)\n" +
-        		"  \"ac,\"\n" +
-        		"  \"*,\"\n", dump(alt));
+        assertEquals("(null)" + NL +
+        		"  \"ac,\"" + NL +
+        		"  \"*,\"" + NL, dump(alt));
     }
 
     public void testTrie3() {
@@ -107,11 +107,11 @@ public void testTrie3() {
         alt.addBranch("ac,!hoge,");
         alt.addBranch("ac,*,");
         // exception goes first.
-        assertEquals("(null)\n" +
-        		"  \"ac,\"\n" +
-        		"    \"!hoge,\"\n" +
-        		"    \"*,\"\n" +
-        		"    \"\"\n", dump(alt));
+        assertEquals("(null)" + NL +
+        		"  \"ac,\"" + NL +
+        		"    \"!hoge,\"" + NL +
+        		"    \"*,\"" + NL +
+        		"    \"\"" + NL, dump(alt));
     }
 
     // test of higher-level functionality
diff --git a/src/test/java/org/archive/util/binsearch/SortedTextFileTest.java b/src/test/java/org/archive/util/binsearch/SortedTextFileTest.java
index 2c9d19e8..8f812b75 100644
--- a/src/test/java/org/archive/util/binsearch/SortedTextFileTest.java
+++ b/src/test/java/org/archive/util/binsearch/SortedTextFileTest.java
@@ -25,7 +25,7 @@ private void createFile(File target, int max) throws FileNotFoundException {
 
 
 	public void testGetRecordIteratorStringBoolean() throws IOException {
-		File test = new File("/tmp/test.tmp");
+		File test = File.createTempFile("test", null);
 		int max = 1000000;
 		createFile(test,max);
 		RandomAccessFileSeekableLineReaderFactory factory = 
diff --git a/src/test/java/org/archive/util/iterator/SortedCompositeIteratorTest.java b/src/test/java/org/archive/util/iterator/SortedCompositeIteratorTest.java
index f1c2a0ec..11ea1229 100644
--- a/src/test/java/org/archive/util/iterator/SortedCompositeIteratorTest.java
+++ b/src/test/java/org/archive/util/iterator/SortedCompositeIteratorTest.java
@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Comparator;
 
@@ -11,21 +12,11 @@
 
 public class SortedCompositeIteratorTest extends TestCase {
 
-	public void testHasNext() throws FileNotFoundException {
+	public void testHasNext() throws FileNotFoundException, IOException {
 		
-		long t = 210000;
-		long c = 134;
-		float f = (float)c / (float)t;
-		System.err.format("F(%f)\n",f);
+		File a = File.createTempFile("filea", null); 
+		File b = File.createTempFile("fileb", null);
 		
-		File a = new File("/tmp/a");
-		File b = new File("/tmp/b");
-		if(a.isFile()) {
-			a.delete();
-		}
-		if(b.isFile()) {
-			b.delete();
-		}
 		PrintWriter apw = new PrintWriter(a);
 		PrintWriter bpw = new PrintWriter(b);
 		apw.println("1");
@@ -38,6 +29,7 @@ public void testHasNext() throws FileNotFoundException {
 		BufferedReader bbr = new BufferedReader(new FileReader(b));
 		SortedCompositeIterator<String> sci = new SortedCompositeIterator<String>(new Comparator<String>() {
 
+                        @Override
 			public int compare(String o1, String o2) {
 				return o1.compareTo(o2);
 			}