From bc01100d5ce64d54b6c49f128f6f0fbe92557fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Mon, 13 Jul 2015 11:47:53 +0200
Subject: [PATCH] test: remove manual clean up of temporary files

Not needed after previous commit.
---
 src/test/blk_nblock/TEST0              | 4 +---
 src/test/blk_nblock/TEST1              | 3 +--
 src/test/blk_non_zero/TEST0            | 4 ----
 src/test/blk_non_zero/TEST1            | 4 ----
 src/test/blk_non_zero/TEST2            | 4 ----
 src/test/blk_non_zero/TEST3            | 4 ----
 src/test/blk_non_zero/TEST4            | 4 ----
 src/test/blk_non_zero/TEST5            | 3 ---
 src/test/blk_non_zero/TEST6            | 3 ---
 src/test/blk_non_zero/TEST7            | 3 ---
 src/test/blk_non_zero/TEST8            | 4 ----
 src/test/blk_pool/TEST0                | 4 ----
 src/test/blk_pool/TEST1                | 3 ---
 src/test/blk_pool/TEST10               | 3 ---
 src/test/blk_pool/TEST11               | 3 ---
 src/test/blk_pool/TEST12               | 2 --
 src/test/blk_pool/TEST13               | 4 ----
 src/test/blk_pool/TEST14               | 2 --
 src/test/blk_pool/TEST2                | 2 --
 src/test/blk_pool/TEST20               | 2 --
 src/test/blk_pool/TEST21               | 3 ---
 src/test/blk_pool/TEST22               | 4 ----
 src/test/blk_pool/TEST23               | 3 ---
 src/test/blk_pool/TEST24               | 4 ----
 src/test/blk_pool/TEST25               | 4 ----
 src/test/blk_pool/TEST26               | 4 ----
 src/test/blk_pool/TEST27               | 4 ----
 src/test/blk_pool/TEST28               | 4 ----
 src/test/blk_pool/TEST3                | 3 ---
 src/test/blk_pool/TEST4                | 3 ---
 src/test/blk_pool/TEST5                | 2 --
 src/test/blk_pool/TEST6                | 3 ---
 src/test/blk_pool/TEST7                | 4 ----
 src/test/blk_pool/TEST8                | 4 ----
 src/test/blk_pool/TEST9                | 2 --
 src/test/blk_recovery/TEST0            | 4 +---
 src/test/blk_rw/TEST0                  | 4 +---
 src/test/blk_rw/TEST1                  | 4 +---
 src/test/blk_rw/TEST2                  | 4 +---
 src/test/blk_rw/TEST3                  | 4 +---
 src/test/blk_rw/TEST4                  | 4 +---
 src/test/blk_rw/TEST5                  | 4 +---
 src/test/blk_rw/TEST6                  | 5 +----
 src/test/blk_rw_mt/TEST0               | 4 +---
 src/test/blk_rw_mt/TEST1               | 4 +---
 src/test/blk_rw_mt/TEST2               | 4 +---
 src/test/log_basic/TEST0               | 5 +----
 src/test/log_basic/TEST1               | 5 +----
 src/test/log_basic/TEST2               | 5 +----
 src/test/log_basic/TEST3               | 5 +----
 src/test/log_pool/TEST0                | 4 ----
 src/test/log_pool/TEST1                | 3 ---
 src/test/log_pool/TEST10               | 3 ---
 src/test/log_pool/TEST2                | 2 --
 src/test/log_pool/TEST20               | 2 --
 src/test/log_pool/TEST21               | 1 -
 src/test/log_pool/TEST22               | 4 ----
 src/test/log_pool/TEST23               | 3 ---
 src/test/log_pool/TEST24               | 4 ----
 src/test/log_pool/TEST25               | 4 ----
 src/test/log_pool/TEST26               | 4 ----
 src/test/log_pool/TEST3                | 3 ---
 src/test/log_pool/TEST4                | 3 ---
 src/test/log_pool/TEST5                | 2 --
 src/test/log_pool/TEST6                | 4 ----
 src/test/log_pool/TEST7                | 4 ----
 src/test/log_pool/TEST8                | 2 --
 src/test/log_pool/TEST9                | 3 ---
 src/test/log_recovery/TEST0            | 5 +----
 src/test/log_recovery/TEST1            | 5 +----
 src/test/log_walker/TEST0              | 5 +----
 src/test/obj_basic_integration/TEST0   | 4 ----
 src/test/obj_debug/TEST0               | 4 ----
 src/test/obj_debug/TEST1               | 4 ----
 src/test/obj_debug/TEST2               | 4 ----
 src/test/obj_direct/TEST0              | 2 --
 src/test/obj_list/TEST0                | 2 --
 src/test/obj_list_insert/TEST0         | 3 ---
 src/test/obj_list_insert/TEST1         | 3 ---
 src/test/obj_list_insert/TEST2         | 3 ---
 src/test/obj_list_insert/TEST3         | 3 ---
 src/test/obj_list_insert/TEST4         | 3 ---
 src/test/obj_list_insert_new/TEST0     | 3 ---
 src/test/obj_list_insert_new/TEST1     | 3 ---
 src/test/obj_list_insert_new/TEST2     | 3 ---
 src/test/obj_list_insert_new/TEST3     | 3 ---
 src/test/obj_list_insert_new/TEST4     | 3 ---
 src/test/obj_list_move/TEST0           | 4 ----
 src/test/obj_list_move/TEST1           | 4 ----
 src/test/obj_list_move_oob/TEST0       | 4 ----
 src/test/obj_list_realloc/TEST0        | 3 ---
 src/test/obj_list_realloc/TEST1        | 3 ---
 src/test/obj_list_realloc/TEST2        | 3 ---
 src/test/obj_list_realloc/TEST3        | 3 ---
 src/test/obj_list_realloc/TEST4        | 3 ---
 src/test/obj_list_realloc/TEST5        | 3 ---
 src/test/obj_list_realloc/TEST6        | 3 ---
 src/test/obj_list_realloc/TEST7        | 3 ---
 src/test/obj_list_realloc_move/TEST0   | 4 ----
 src/test/obj_list_realloc_move/TEST1   | 5 -----
 src/test/obj_list_recovery/TEST0       | 3 ---
 src/test/obj_list_recovery/TEST1       | 3 ---
 src/test/obj_list_recovery/TEST2       | 3 ---
 src/test/obj_list_recovery/TEST3       | 3 ---
 src/test/obj_list_recovery/TEST4       | 3 ---
 src/test/obj_list_recovery/TEST5       | 3 ---
 src/test/obj_list_recovery/TEST6       | 3 ---
 src/test/obj_list_recovery/TEST7       | 3 ---
 src/test/obj_list_remove/TEST0         | 3 ---
 src/test/obj_list_remove/TEST1         | 3 ---
 src/test/obj_list_remove/TEST2         | 3 ---
 src/test/obj_list_remove/TEST3         | 3 ---
 src/test/obj_list_remove_free/TEST0    | 3 ---
 src/test/obj_list_remove_free/TEST1    | 3 ---
 src/test/obj_list_remove_free/TEST2    | 3 ---
 src/test/obj_list_remove_free/TEST3    | 3 ---
 src/test/obj_list_remove_free/TEST4    | 3 ---
 src/test/obj_list_valgrind/TEST0       | 3 ---
 src/test/obj_list_valgrind/TEST1       | 3 ---
 src/test/obj_list_valgrind/TEST2       | 1 -
 src/test/obj_list_valgrind/TEST3       | 1 -
 src/test/obj_list_valgrind/TEST4       | 3 ---
 src/test/obj_list_valgrind/TEST5       | 3 ---
 src/test/obj_list_valgrind/TEST6       | 3 ---
 src/test/obj_list_valgrind/TEST7       | 3 ---
 src/test/obj_list_valgrind/TEST8       | 4 ----
 src/test/obj_pool/TEST0                | 4 ----
 src/test/obj_pool/TEST1                | 3 ---
 src/test/obj_pool/TEST10               | 3 ---
 src/test/obj_pool/TEST11               | 3 ---
 src/test/obj_pool/TEST12               | 4 ----
 src/test/obj_pool/TEST13               | 4 ----
 src/test/obj_pool/TEST14               | 2 --
 src/test/obj_pool/TEST2                | 2 --
 src/test/obj_pool/TEST20               | 2 --
 src/test/obj_pool/TEST21               | 3 ---
 src/test/obj_pool/TEST22               | 4 ----
 src/test/obj_pool/TEST23               | 3 ---
 src/test/obj_pool/TEST24               | 4 ----
 src/test/obj_pool/TEST25               | 4 ----
 src/test/obj_pool/TEST26               | 4 ----
 src/test/obj_pool/TEST27               | 4 ----
 src/test/obj_pool/TEST28               | 4 ----
 src/test/obj_pool/TEST3                | 3 ---
 src/test/obj_pool/TEST4                | 3 ---
 src/test/obj_pool/TEST5                | 2 --
 src/test/obj_pool/TEST6                | 3 ---
 src/test/obj_pool/TEST7                | 4 ----
 src/test/obj_pool/TEST8                | 4 ----
 src/test/obj_pool/TEST9                | 2 --
 src/test/obj_recovery/TEST0            | 2 --
 src/test/obj_redo_log/TEST0            | 3 ---
 src/test/obj_redo_log/TEST1            | 3 ---
 src/test/obj_redo_log/TEST2            | 3 ---
 src/test/obj_redo_log/TEST3            | 3 ---
 src/test/obj_redo_log/TEST4            | 3 ---
 src/test/obj_redo_log/TEST5            | 3 ---
 src/test/obj_redo_log/TEST6            | 3 ---
 src/test/obj_store/TEST0               | 4 ----
 src/test/obj_store/TEST1               | 4 ----
 src/test/obj_store/TEST2               | 4 ----
 src/test/obj_store/TEST3               | 4 ----
 src/test/obj_store/TEST4               | 4 ----
 src/test/obj_store/TEST5               | 4 ----
 src/test/obj_tx_add_range/TEST0        | 4 ----
 src/test/obj_tx_add_range/TEST1        | 2 --
 src/test/obj_tx_add_range_direct/TEST0 | 4 ----
 src/test/obj_tx_add_range_direct/TEST1 | 2 --
 src/test/obj_tx_alloc/TEST0            | 4 ----
 src/test/obj_tx_alloc/TEST1            | 3 ---
 src/test/obj_tx_flow/TEST0             | 2 --
 src/test/obj_tx_free/TEST0             | 4 ----
 src/test/obj_tx_free/TEST1             | 2 --
 src/test/obj_tx_locks/TEST0            | 2 --
 src/test/obj_tx_locks/TEST1            | 2 --
 src/test/obj_tx_locks/TEST2            | 2 --
 src/test/obj_tx_locks_abort/TEST0      | 4 ----
 src/test/obj_tx_locks_abort/TEST1      | 2 --
 src/test/obj_tx_locks_abort/TEST2      | 2 --
 src/test/obj_tx_realloc/TEST0          | 4 ----
 src/test/obj_tx_strdup/TEST0           | 4 ----
 src/test/out_err_mt/TEST0              | 6 ------
 src/test/out_err_mt/TEST1              | 6 ------
 src/test/out_err_mt/TEST2              | 6 ------
 src/test/pmem_is_pmem/TEST0            | 4 +---
 src/test/pmem_is_pmem/TEST1            | 4 +---
 src/test/pmem_is_pmem/TEST2            | 4 +---
 src/test/pmem_is_pmem/TEST3            | 4 +---
 src/test/pmem_map/TEST0                | 5 +----
 src/test/pmem_map/TEST1                | 5 +----
 src/test/pmem_memcpy/TEST0             | 3 ---
 src/test/pmem_memcpy/TEST1             | 3 ---
 src/test/pmem_memcpy/TEST2             | 3 ---
 src/test/pmem_memcpy/TEST3             | 3 ---
 src/test/pmem_memmove/TEST0            | 3 ---
 src/test/pmem_memmove/TEST1            | 3 ---
 src/test/pmem_memmove/TEST10           | 3 ---
 src/test/pmem_memmove/TEST11           | 3 ---
 src/test/pmem_memmove/TEST12           | 3 ---
 src/test/pmem_memmove/TEST2            | 3 ---
 src/test/pmem_memmove/TEST3            | 3 ---
 src/test/pmem_memmove/TEST4            | 3 ---
 src/test/pmem_memmove/TEST5            | 3 ---
 src/test/pmem_memmove/TEST6            | 3 ---
 src/test/pmem_memmove/TEST7            | 3 ---
 src/test/pmem_memmove/TEST8            | 3 ---
 src/test/pmem_memmove/TEST9            | 3 ---
 src/test/pmem_memset/TEST0             | 3 ---
 src/test/pmem_memset/TEST1             | 3 ---
 src/test/pmem_memset/TEST2             | 3 ---
 src/test/pmem_valgr_simple/TEST0       | 3 ---
 src/test/pmempool_check/TEST0          | 3 ---
 src/test/pmempool_check/TEST1          | 3 ---
 src/test/pmempool_check/TEST2          | 5 -----
 src/test/pmempool_check/TEST3          | 3 ---
 src/test/pmempool_check/TEST4          | 3 ---
 src/test/pmempool_check/TEST5          | 4 ----
 src/test/pmempool_create/TEST0         | 3 ---
 src/test/pmempool_create/TEST1         | 3 ---
 src/test/pmempool_create/TEST2         | 3 ---
 src/test/pmempool_create/TEST3         | 5 -----
 src/test/pmempool_create/TEST4         | 3 ---
 src/test/pmempool_create/TEST5         | 3 ---
 src/test/pmempool_dump/TEST0           | 3 ---
 src/test/pmempool_dump/TEST1           | 3 ---
 src/test/pmempool_dump/TEST2           | 3 ---
 src/test/pmempool_dump/TEST3           | 3 ---
 src/test/pmempool_dump/TEST4           | 3 ---
 src/test/pmempool_info/TEST0           | 3 ---
 src/test/pmempool_info/TEST1           | 3 ---
 src/test/pmempool_info/TEST2           | 3 ---
 src/test/pmempool_info/TEST3           | 3 ---
 src/test/pmempool_info/TEST4           | 3 ---
 src/test/pmempool_info/TEST5           | 3 ---
 src/test/pmempool_info/TEST6           | 3 ---
 src/test/pmempool_info/TEST7           | 3 ---
 src/test/pmempool_info/TEST8           | 3 ---
 src/test/pmempool_info/TEST9           | 3 ---
 src/test/util_pool_create/TEST0        | 9 ---------
 src/test/util_pool_create/TEST1        | 2 +-
 src/test/util_pool_open/TEST0          | 7 -------
 src/test/util_pool_open/TEST1          | 8 --------
 242 files changed, 27 insertions(+), 787 deletions(-)

diff --git a/src/test/blk_nblock/TEST0 b/src/test/blk_nblock/TEST0
index 480df5c75..f517ad301 100755
--- a/src/test/blk_nblock/TEST0
+++ b/src/test/blk_nblock/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,7 +54,6 @@ setup
 # These are holey files, so they actually don't take up
 # any significant space.
 #
-rm -f $DIR/testfile1
 truncate -s 2M $DIR/testfile1
 truncate -s 2G $DIR/testfile2.512
 truncate -s 2G $DIR/testfile2.520
@@ -137,7 +136,6 @@ expect_normal_exit ./blk_nblock$EXESUFFIX\
 	4096:$DIR/testfile7.4096\
 	4160:$DIR/testfile7.4160\
 	4224:$DIR/testfile7.4224
-rm $DIR/testfile1 $DIR/testfile[234567].*
 
 check
 
diff --git a/src/test/blk_nblock/TEST1 b/src/test/blk_nblock/TEST1
index d4dbdb0ca..a89a04c32 100755
--- a/src/test/blk_nblock/TEST1
+++ b/src/test/blk_nblock/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -91,7 +91,6 @@ expect_normal_exit ./blk_nblock$EXESUFFIX\
 	1073741824:$DIR/testfile2.1073741824\
 	2147483648:$DIR/testfile2.2147483648\
 	-1:$DIR/testfile2.-1
-rm $DIR/testfile[1,2].*
 
 check
 
diff --git a/src/test/blk_non_zero/TEST0 b/src/test/blk_non_zero/TEST0
index 06c2d3474..39ae02b3a 100755
--- a/src/test/blk_non_zero/TEST0
+++ b/src/test/blk_non_zero/TEST0
@@ -47,8 +47,6 @@ require_fs_type pmem non-pmem
 setup
 
 # single arena and minimum pmemblk pool file case
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 17 8 $DIR/testfile1
 
 #
@@ -59,8 +57,6 @@ create_nonzeroed_file 17 8 $DIR/testfile1
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
 	r:0 r:1 r:34217 r:34218 z:0 z:1 r:0 e:3 r:4
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST1 b/src/test/blk_non_zero/TEST1
index 58b5a130e..b2f1d8207 100755
--- a/src/test/blk_non_zero/TEST1
+++ b/src/test/blk_non_zero/TEST1
@@ -48,15 +48,11 @@ require_test_type long
 setup
 
 # single arena write case
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 1024 $((824 * 1024)) $DIR/testfile1
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
 	w:0 r:1 r:0 w:1 r:0 r:1 r:2
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST2 b/src/test/blk_non_zero/TEST2
index 42ddef1f5..54616b5ec 100755
--- a/src/test/blk_non_zero/TEST2
+++ b/src/test/blk_non_zero/TEST2
@@ -48,8 +48,6 @@ require_test_type long
 setup
 
 # write re-use test case
-rm -f $DIR/testfile1
-
 crate_nonzeroed_file 1024 $((824 * 1024)) $DIR/testfile1
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
@@ -58,8 +56,6 @@ expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 o\
 	w:0 r:4 r:3 r:2 r:1 r:0 w:0 r:0
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST3 b/src/test/blk_non_zero/TEST3
index 922b1b903..4dbd7d3fb 100755
--- a/src/test/blk_non_zero/TEST3
+++ b/src/test/blk_non_zero/TEST3
@@ -48,8 +48,6 @@ require_test_type long
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 1024 $((824 * 1024)) $DIR/testfile1
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
@@ -60,8 +58,6 @@ expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
 	e:100 w:200 e:300 w:400\
 	r:100 r:200 r:300 r:400
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST4 b/src/test/blk_non_zero/TEST4
index 5676cc376..8e081c369 100755
--- a/src/test/blk_non_zero/TEST4
+++ b/src/test/blk_non_zero/TEST4
@@ -48,8 +48,6 @@ require_test_type long
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 1024 $((824*1024)) $DIR/testfile1
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
@@ -60,8 +58,6 @@ expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c 0\
 		w:5 e:5 z:5 r:5\
 		w:6 z:6 e:6 r:6
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST5 b/src/test/blk_non_zero/TEST5
index b84b470c1..1cb3c8c38 100755
--- a/src/test/blk_non_zero/TEST5
+++ b/src/test/blk_non_zero/TEST5
@@ -48,7 +48,6 @@ setup
 
 # single arena and minimum pmemblk pool file case
 MIN_POOL_SIZE=$((16*1024*1024 + 8*1024))
-rm -f $DIR/testfile1
 
 #
 # All reads to an unwritten block pool should return zeros.
@@ -58,8 +57,6 @@ rm -f $DIR/testfile1
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $MIN_POOL_SIZE\
 	r:0 r:1 r:32201 r:32202 z:0 z:1 r:0
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_non_zero/TEST6 b/src/test/blk_non_zero/TEST6
index f0fb93103..fa278ddb8 100755
--- a/src/test/blk_non_zero/TEST6
+++ b/src/test/blk_non_zero/TEST6
@@ -47,13 +47,10 @@ require_fs_type pmem non-pmem
 setup
 
 # single arena write case
-rm -f $DIR/testfile1
-
 FILE_SIZE=$((1024*1024*1024))
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $FILE_SIZE\
 	w:0 r:1 r:0 w:1 r:0 r:1 r:2
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_non_zero/TEST7 b/src/test/blk_non_zero/TEST7
index e7825cba9..0c613329a 100755
--- a/src/test/blk_non_zero/TEST7
+++ b/src/test/blk_non_zero/TEST7
@@ -47,8 +47,6 @@ require_fs_type pmem non-pmem
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
-
 FILE_SIZE=$((1024*1024*1024))
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $FILE_SIZE\
@@ -58,7 +56,6 @@ expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $FILE_SIZE\
 	r:100 r:200 r:300 r:400\
 	e:100 w:200 e:300 w:400\
 	r:100 r:200 r:300 r:400
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_non_zero/TEST8 b/src/test/blk_non_zero/TEST8
index d8e72d1cd..c96711054 100755
--- a/src/test/blk_non_zero/TEST8
+++ b/src/test/blk_non_zero/TEST8
@@ -47,8 +47,6 @@ require_fs_type pmem non-pmem
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
-
 FILE_SIZE=$((1024*1024*1024))
 
 expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $FILE_SIZE\
@@ -59,8 +57,6 @@ expect_normal_exit ./blk_non_zero$EXESUFFIX 512 $DIR/testfile1 c $FILE_SIZE\
 		w:5 e:5 z:5 r:5\
 		w:6 z:6 e:6 r:6
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST0 b/src/test/blk_pool/TEST0
index 294ef4624..3a73e8cae 100755
--- a/src/test/blk_pool/TEST0
+++ b/src/test/blk_pool/TEST0
@@ -43,8 +43,6 @@ export UNITTEST_NUM=0
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST0 non-existing file, poolsize > 0
 #
@@ -55,8 +53,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST1 b/src/test/blk_pool/TEST1
index 6aa7fffc7..199f9e4ac 100755
--- a/src/test/blk_pool/TEST1
+++ b/src/test/blk_pool/TEST1
@@ -43,7 +43,6 @@ export UNITTEST_NUM=1
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST10 b/src/test/blk_pool/TEST10
index 4908bc1b5..35a58a1fc 100755
--- a/src/test/blk_pool/TEST10
+++ b/src/test/blk_pool/TEST10
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0240 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST11 b/src/test/blk_pool/TEST11
index 5196affd4..bb8f2a1d3 100755
--- a/src/test/blk_pool/TEST11
+++ b/src/test/blk_pool/TEST11
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0440 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 20 0640
     exit 1
 }
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST12 b/src/test/blk_pool/TEST12
index dde70b1f7..3985f892a 100755
--- a/src/test/blk_pool/TEST12
+++ b/src/test/blk_pool/TEST12
@@ -43,8 +43,6 @@ export UNITTEST_NUM=12
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST12 non-existing file, poolsize >= min required size, bsize == 0
 #
diff --git a/src/test/blk_pool/TEST13 b/src/test/blk_pool/TEST13
index d8d902b3a..c6bbca720 100755
--- a/src/test/blk_pool/TEST13
+++ b/src/test/blk_pool/TEST13
@@ -43,8 +43,6 @@ export UNITTEST_NUM=13
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST13 non-existing file, poolsize >= min required size, bsize < min bsize
 #
@@ -55,8 +53,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 10 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST14 b/src/test/blk_pool/TEST14
index ac8294e82..df1a0d13c 100755
--- a/src/test/blk_pool/TEST14
+++ b/src/test/blk_pool/TEST14
@@ -43,8 +43,6 @@ export UNITTEST_NUM=14
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST14 non-existing file, poolsize >= min required size, bsize > min bsize
 #        block size is too large
diff --git a/src/test/blk_pool/TEST2 b/src/test/blk_pool/TEST2
index 74c08f6d7..03d5ab2b5 100755
--- a/src/test/blk_pool/TEST2
+++ b/src/test/blk_pool/TEST2
@@ -43,8 +43,6 @@ export UNITTEST_NUM=2
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST2 non-existing file, poolsize == 0
 #
diff --git a/src/test/blk_pool/TEST20 b/src/test/blk_pool/TEST20
index e7cbb68c8..5185541d9 100755
--- a/src/test/blk_pool/TEST20
+++ b/src/test/blk_pool/TEST20
@@ -43,8 +43,6 @@ export UNITTEST_NUM=20
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST20 non-existing file, bsize == 0
 #
diff --git a/src/test/blk_pool/TEST21 b/src/test/blk_pool/TEST21
index dcd947b25..733b57b64 100755
--- a/src/test/blk_pool/TEST21
+++ b/src/test/blk_pool/TEST21
@@ -43,7 +43,6 @@ export UNITTEST_NUM=21
 setup
 umask 0
 
-rm -f $DIR/testfile
 create_holey_file 1 $DIR/testfile
 
 #
@@ -51,8 +50,6 @@ create_holey_file 1 $DIR/testfile
 #
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST22 b/src/test/blk_pool/TEST22
index 1d66f3823..acbe440f4 100755
--- a/src/test/blk_pool/TEST22
+++ b/src/test/blk_pool/TEST22
@@ -43,8 +43,6 @@ export UNITTEST_NUM=22
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST22 existing file, file size < min required size, bsize == 0
 #        (valid pool header)
@@ -54,8 +52,6 @@ truncate -s 1M $DIR/testfile
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST23 b/src/test/blk_pool/TEST23
index 4ef126cbf..ce33bbfc3 100755
--- a/src/test/blk_pool/TEST23
+++ b/src/test/blk_pool/TEST23
@@ -43,7 +43,6 @@ export UNITTEST_NUM=23
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 
 #
@@ -52,8 +51,6 @@ truncate -s 2G $DIR/testfile
 #
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST24 b/src/test/blk_pool/TEST24
index c73d1084a..695fd8f2f 100755
--- a/src/test/blk_pool/TEST24
+++ b/src/test/blk_pool/TEST24
@@ -43,8 +43,6 @@ export UNITTEST_NUM=24
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST24 existing file, file size >= min required size, bsize == 1024
 #        (bsize doesn't match the value from pool header)
@@ -53,8 +51,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 512 20 0640
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 1024
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST25 b/src/test/blk_pool/TEST25
index f5291fa64..511651ac8 100755
--- a/src/test/blk_pool/TEST25
+++ b/src/test/blk_pool/TEST25
@@ -43,8 +43,6 @@ export UNITTEST_NUM=25
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST25 existing file, file size >= min required size, bsize == 0
 #        (no read permissions)
@@ -54,8 +52,6 @@ chmod -r $DIR/testfile
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST26 b/src/test/blk_pool/TEST26
index 8bda6fd07..92ff1c939 100755
--- a/src/test/blk_pool/TEST26
+++ b/src/test/blk_pool/TEST26
@@ -43,8 +43,6 @@ export UNITTEST_NUM=26
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST26 existing file, file size >= min required size, bsize == 0
 #        (no write permissions)
@@ -54,8 +52,6 @@ chmod -w $DIR/testfile
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST27 b/src/test/blk_pool/TEST27
index d52e95432..12f727718 100755
--- a/src/test/blk_pool/TEST27
+++ b/src/test/blk_pool/TEST27
@@ -43,8 +43,6 @@ export UNITTEST_NUM=27
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST27 existing file, file size >= min required size, bsize == 0
 #
@@ -52,8 +50,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 512 20 0640
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 0
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST28 b/src/test/blk_pool/TEST28
index 80cacde28..cc59e3772 100755
--- a/src/test/blk_pool/TEST28
+++ b/src/test/blk_pool/TEST28
@@ -43,8 +43,6 @@ export UNITTEST_NUM=28
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST28 existing file, file size >= min required size, bsize == 300
 #
@@ -52,8 +50,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 300 20 0640
 
 expect_normal_exit ./blk_pool$EXESUFFIX o $DIR/testfile 300
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST3 b/src/test/blk_pool/TEST3
index 65a17d711..e42f7528e 100755
--- a/src/test/blk_pool/TEST3
+++ b/src/test/blk_pool/TEST3
@@ -43,7 +43,6 @@ export UNITTEST_NUM=3
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST4 b/src/test/blk_pool/TEST4
index fd92c1bc6..f436b08af 100755
--- a/src/test/blk_pool/TEST4
+++ b/src/test/blk_pool/TEST4
@@ -43,7 +43,6 @@ export UNITTEST_NUM=4
 setup
 umask 0
 
-rm -f $DIR/testfile
 touch $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST5 b/src/test/blk_pool/TEST5
index a0583fd64..b6bc8c9ed 100755
--- a/src/test/blk_pool/TEST5
+++ b/src/test/blk_pool/TEST5
@@ -43,8 +43,6 @@ export UNITTEST_NUM=5
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST5 non-existing file, poolsize > 0
 #       path is invalid (directory not exist)
diff --git a/src/test/blk_pool/TEST6 b/src/test/blk_pool/TEST6
index a920604c4..602fa7325 100755
--- a/src/test/blk_pool/TEST6
+++ b/src/test/blk_pool/TEST6
@@ -43,7 +43,6 @@ export UNITTEST_NUM=6
 setup
 umask 0
 
-rm -f $DIR/testfile
 touch $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -58,8 +57,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 0 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST7 b/src/test/blk_pool/TEST7
index 5cfac064c..5e25f810f 100755
--- a/src/test/blk_pool/TEST7
+++ b/src/test/blk_pool/TEST7
@@ -43,8 +43,6 @@ export UNITTEST_NUM=7
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 17 0 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST8 b/src/test/blk_pool/TEST8
index 39a9a10fe..f0fe213ae 100755
--- a/src/test/blk_pool/TEST8
+++ b/src/test/blk_pool/TEST8
@@ -43,8 +43,6 @@ export UNITTEST_NUM=8
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 17 8 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./blk_pool$EXESUFFIX c $DIR/testfile 4096 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/blk_pool/TEST9 b/src/test/blk_pool/TEST9
index f5cea77f9..556701726 100755
--- a/src/test/blk_pool/TEST9
+++ b/src/test/blk_pool/TEST9
@@ -43,8 +43,6 @@ export UNITTEST_NUM=9
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST9 non-existing file, poolsize < min required size
 #
diff --git a/src/test/blk_recovery/TEST0 b/src/test/blk_recovery/TEST0
index d591cd53c..1c7db46df 100755
--- a/src/test/blk_recovery/TEST0
+++ b/src/test/blk_recovery/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@ require_build_type nondebug static-nondebug
 setup
 
 # single arena case
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 
 #
@@ -55,7 +54,6 @@ truncate -s 2G $DIR/testfile1
 # that testfile1 is consistent (after recovery steps were taken).
 #
 expect_normal_exit ./blk_recovery$EXESUFFIX 4096 $DIR/testfile1 5 10
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST0 b/src/test/blk_rw/TEST0
index 552870f4f..7c8c91e08 100755
--- a/src/test/blk_rw/TEST0
+++ b/src/test/blk_rw/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@ setup
 
 # single arena and minimum pmemblk pool file case
 MIN_POOL_SIZE=$((16*1024*1024 + 8*1024))
-rm -f $DIR/testfile1
 truncate -s $MIN_POOL_SIZE $DIR/testfile1
 #
 # All reads to an unwritten block pool should return zeros.
@@ -56,7 +55,6 @@ truncate -s $MIN_POOL_SIZE $DIR/testfile1
 #
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	r:0 r:1 r:32201 r:32202 z:0 z:1 r:0
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST1 b/src/test/blk_rw/TEST1
index c81588d9a..848b6c82a 100755
--- a/src/test/blk_rw/TEST1
+++ b/src/test/blk_rw/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@ require_unlimited_vm
 setup
 
 # multi-arena case
-rm -f $DIR/testfile1
 truncate -s 1026G $DIR/testfile1
 #
 # All reads to an unwritten block pool should return zeros.
@@ -56,7 +55,6 @@ truncate -s 1026G $DIR/testfile1
 #
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	r:0 r:1 r:4161480 r:2134997325 r:2134997326 z:0 z:4161480
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST2 b/src/test/blk_rw/TEST2
index 2571e3295..4a42435d9 100755
--- a/src/test/blk_rw/TEST2
+++ b/src/test/blk_rw/TEST2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@ require_unlimited_vm
 setup
 
 # multi-arena case
-rm -f $DIR/testfile1
 truncate -s 1026G $DIR/testfile1
 #
 # All reads to an unwritten block pool should return zeros.
@@ -56,7 +55,6 @@ truncate -s 1026G $DIR/testfile1
 #
 expect_normal_exit ./blk_rw$EXESUFFIX 4096 $DIR/testfile1 c\
 	r:0 r:1 r:4161480 r:268696550 r:268696551 z:0 z:4161480
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST3 b/src/test/blk_rw/TEST3
index e512be7e3..93fb8aa50 100755
--- a/src/test/blk_rw/TEST3
+++ b/src/test/blk_rw/TEST3
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,11 +46,9 @@ require_fs_type pmem non-pmem
 setup
 
 # single arena write case
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	w:0 r:1 r:0 w:1 r:0 r:1 r:2
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST4 b/src/test/blk_rw/TEST4
index 17b8d0c3a..5465f5ac3 100755
--- a/src/test/blk_rw/TEST4
+++ b/src/test/blk_rw/TEST4
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,13 +46,11 @@ require_fs_type pmem non-pmem
 setup
 
 # write re-use test case
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	w:0 w:1 w:2 w:3 w:4 r:4 r:3 r:2 r:1 r:0
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 o\
 	w:0 r:4 r:3 r:2 r:1 r:0 w:0 r:0
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST5 b/src/test/blk_rw/TEST5
index 2ae10f1bf..ff4bc4d0b 100755
--- a/src/test/blk_rw/TEST5
+++ b/src/test/blk_rw/TEST5
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,6 @@ require_fs_type pmem non-pmem
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	w:100 w:200 w:300 w:400\
@@ -55,7 +54,6 @@ expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 	r:100 r:200 r:300 r:400\
 	e:100 w:200 e:300 w:400\
 	r:100 r:200 r:300 r:400
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw/TEST6 b/src/test/blk_rw/TEST6
index 8c407039d..8a2b26226 100755
--- a/src/test/blk_rw/TEST6
+++ b/src/test/blk_rw/TEST6
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,6 @@ require_fs_type pmem non-pmem
 setup
 
 # mix writes with set_zero and set_error and check results
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 		e:1 r:1\
@@ -56,8 +55,6 @@ expect_normal_exit ./blk_rw$EXESUFFIX 512 $DIR/testfile1 c\
 		w:5 e:5 z:5 r:5\
 		w:6 z:6 e:6 r:6
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/blk_rw_mt/TEST0 b/src/test/blk_rw_mt/TEST0
index 3d9909e75..8229892db 100755
--- a/src/test/blk_rw_mt/TEST0
+++ b/src/test/blk_rw_mt/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,11 +45,9 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 # 5 threads, each doing 80 random I/Os
 expect_normal_exit ./blk_rw_mt$EXESUFFIX 4096 $DIR/testfile1 123 5 80
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw_mt/TEST1 b/src/test/blk_rw_mt/TEST1
index b842897e0..59db1c129 100755
--- a/src/test/blk_rw_mt/TEST1
+++ b/src/test/blk_rw_mt/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,11 +48,9 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 # 100 threads, each doing 100 random I/Os
 expect_normal_exit ./blk_rw_mt$EXESUFFIX 4096 $DIR/testfile1 456 100 100
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/blk_rw_mt/TEST2 b/src/test/blk_rw_mt/TEST2
index 11b5dca83..1af60e470 100755
--- a/src/test/blk_rw_mt/TEST2
+++ b/src/test/blk_rw_mt/TEST2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,11 +48,9 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 1G $DIR/testfile1
 # 300 threads, each doing 100000 random I/Os
 expect_normal_exit ./blk_rw_mt$EXESUFFIX 4096 $DIR/testfile1 789 300 100000
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/log_basic/TEST0 b/src/test/log_basic/TEST0
index 31f60aaec..fc014812f 100755
--- a/src/test/log_basic/TEST0
+++ b/src/test/log_basic/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -50,13 +50,10 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_basic$EXESUFFIX $DIR/testfile1 n t w r
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_basic/TEST1 b/src/test/log_basic/TEST1
index 4d7fc9e16..b54add18c 100755
--- a/src/test/log_basic/TEST1
+++ b/src/test/log_basic/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -52,13 +52,10 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_basic$EXESUFFIX $DIR/testfile1 a n t w r t w
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_basic/TEST2 b/src/test/log_basic/TEST2
index 74076e0ea..8f764c381 100755
--- a/src/test/log_basic/TEST2
+++ b/src/test/log_basic/TEST2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -52,13 +52,10 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_basic$EXESUFFIX $DIR/testfile1 v n t w r t w
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_basic/TEST3 b/src/test/log_basic/TEST3
index 2ddd831d5..4d5729a41 100755
--- a/src/test/log_basic/TEST3
+++ b/src/test/log_basic/TEST3
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -53,13 +53,10 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_basic$EXESUFFIX $DIR/testfile1 a n t w r t w v n t w r t w
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST0 b/src/test/log_pool/TEST0
index 35f9712f8..0e7db35fe 100755
--- a/src/test/log_pool/TEST0
+++ b/src/test/log_pool/TEST0
@@ -43,8 +43,6 @@ export UNITTEST_NUM=0
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST0 non-existing file, poolsize > 0
 #
@@ -55,8 +53,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST1 b/src/test/log_pool/TEST1
index e1abebc90..54f22f3f6 100755
--- a/src/test/log_pool/TEST1
+++ b/src/test/log_pool/TEST1
@@ -43,7 +43,6 @@ export UNITTEST_NUM=1
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST10 b/src/test/log_pool/TEST10
index 808c8f819..f6d7a54fb 100755
--- a/src/test/log_pool/TEST10
+++ b/src/test/log_pool/TEST10
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0440 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST2 b/src/test/log_pool/TEST2
index 21ec5b844..f052fc8a1 100755
--- a/src/test/log_pool/TEST2
+++ b/src/test/log_pool/TEST2
@@ -43,8 +43,6 @@ export UNITTEST_NUM=2
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST2 non-existing file, poolsize == 0
 #
diff --git a/src/test/log_pool/TEST20 b/src/test/log_pool/TEST20
index 1cdf382d6..d1447099d 100755
--- a/src/test/log_pool/TEST20
+++ b/src/test/log_pool/TEST20
@@ -43,8 +43,6 @@ export UNITTEST_NUM=20
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST20 non-existing file
 #
diff --git a/src/test/log_pool/TEST21 b/src/test/log_pool/TEST21
index d7efb5c34..145022aa4 100755
--- a/src/test/log_pool/TEST21
+++ b/src/test/log_pool/TEST21
@@ -43,7 +43,6 @@ export UNITTEST_NUM=21
 setup
 umask 0
 
-rm -f $DIR/testfile
 create_holey_file 1 $DIR/testfile
 
 #
diff --git a/src/test/log_pool/TEST22 b/src/test/log_pool/TEST22
index e67c1b69a..b087b64c3 100755
--- a/src/test/log_pool/TEST22
+++ b/src/test/log_pool/TEST22
@@ -43,8 +43,6 @@ export UNITTEST_NUM=22
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST22 existing file, file size < min required size
 #        (valid pool header)
@@ -54,8 +52,6 @@ truncate -s 1M $DIR/testfile
 
 expect_normal_exit ./log_pool$EXESUFFIX o $DIR/testfile
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST23 b/src/test/log_pool/TEST23
index 2a70e4e82..32601d5ae 100755
--- a/src/test/log_pool/TEST23
+++ b/src/test/log_pool/TEST23
@@ -43,7 +43,6 @@ export UNITTEST_NUM=23
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 
 #
@@ -52,8 +51,6 @@ truncate -s 2G $DIR/testfile
 #
 expect_normal_exit ./log_pool$EXESUFFIX o $DIR/testfile
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST24 b/src/test/log_pool/TEST24
index ac796ead4..978bb6456 100755
--- a/src/test/log_pool/TEST24
+++ b/src/test/log_pool/TEST24
@@ -43,8 +43,6 @@ export UNITTEST_NUM=24
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST24 existing file, file size >= min required size
 #        (no read permissions)
@@ -54,8 +52,6 @@ chmod -r $DIR/testfile
 
 expect_normal_exit ./log_pool$EXESUFFIX o $DIR/testfile
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST25 b/src/test/log_pool/TEST25
index b1595d209..0a013b47d 100755
--- a/src/test/log_pool/TEST25
+++ b/src/test/log_pool/TEST25
@@ -43,8 +43,6 @@ export UNITTEST_NUM=25
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST25 existing file, file size >= min required size
 #        (no write permissions)
@@ -54,8 +52,6 @@ chmod -w $DIR/testfile
 
 expect_normal_exit ./log_pool$EXESUFFIX o $DIR/testfile
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST26 b/src/test/log_pool/TEST26
index 9e8dfd3a7..b68fa9021 100755
--- a/src/test/log_pool/TEST26
+++ b/src/test/log_pool/TEST26
@@ -43,8 +43,6 @@ export UNITTEST_NUM=26
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST26 existing file, file size >= min required size
 #
@@ -52,8 +50,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 20 0640
 
 expect_normal_exit ./log_pool$EXESUFFIX o $DIR/testfile
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST3 b/src/test/log_pool/TEST3
index 1545a034c..fd4158649 100755
--- a/src/test/log_pool/TEST3
+++ b/src/test/log_pool/TEST3
@@ -43,7 +43,6 @@ export UNITTEST_NUM=3
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST4 b/src/test/log_pool/TEST4
index 54b8e29c3..83d90c920 100755
--- a/src/test/log_pool/TEST4
+++ b/src/test/log_pool/TEST4
@@ -43,7 +43,6 @@ export UNITTEST_NUM=4
 setup
 umask 0
 
-rm -f $DIR/testfile
 touch $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST5 b/src/test/log_pool/TEST5
index b80c7c1cd..b995c9271 100755
--- a/src/test/log_pool/TEST5
+++ b/src/test/log_pool/TEST5
@@ -43,8 +43,6 @@ export UNITTEST_NUM=5
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST5 non-existing file, poolsize > 0
 #       (path is invalid, directory does not exist)
diff --git a/src/test/log_pool/TEST6 b/src/test/log_pool/TEST6
index 8d0e8a6a3..f74f06cd8 100755
--- a/src/test/log_pool/TEST6
+++ b/src/test/log_pool/TEST6
@@ -43,8 +43,6 @@ export UNITTEST_NUM=6
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 2 0 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST7 b/src/test/log_pool/TEST7
index 547db00cd..b247683b9 100755
--- a/src/test/log_pool/TEST7
+++ b/src/test/log_pool/TEST7
@@ -43,8 +43,6 @@ export UNITTEST_NUM=7
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 2 8 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_pool/TEST8 b/src/test/log_pool/TEST8
index ddcbd88db..7d381f2db 100755
--- a/src/test/log_pool/TEST8
+++ b/src/test/log_pool/TEST8
@@ -43,8 +43,6 @@ export UNITTEST_NUM=8
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST8 non-existing file, poolsize < min required size
 #
diff --git a/src/test/log_pool/TEST9 b/src/test/log_pool/TEST9
index fcfcb7bcb..e81768281 100755
--- a/src/test/log_pool/TEST9
+++ b/src/test/log_pool/TEST9
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0240 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./log_pool$EXESUFFIX c $DIR/testfile 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/log_recovery/TEST0 b/src/test/log_recovery/TEST0
index e001eef3d..b0a26229f 100755
--- a/src/test/log_recovery/TEST0
+++ b/src/test/log_recovery/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,13 +45,10 @@ require_build_type nondebug static-nondebug
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_recovery$EXESUFFIX $DIR/testfile1 a
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_recovery/TEST1 b/src/test/log_recovery/TEST1
index 4dc8757f4..4545dc76b 100755
--- a/src/test/log_recovery/TEST1
+++ b/src/test/log_recovery/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,13 +45,10 @@ require_build_type nondebug static-nondebug
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_recovery$EXESUFFIX $DIR/testfile1 v
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/log_walker/TEST0 b/src/test/log_walker/TEST0
index 5d6165bf8..f6cf67dfd 100755
--- a/src/test/log_walker/TEST0
+++ b/src/test/log_walker/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,13 +45,10 @@ require_build_type debug static-debug
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 expect_normal_exit ./log_walker$EXESUFFIX $DIR/testfile1
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_basic_integration/TEST0 b/src/test/obj_basic_integration/TEST0
index 921b23b50..551ba8856 100755
--- a/src/test/obj_basic_integration/TEST0
+++ b/src/test/obj_basic_integration/TEST0
@@ -39,11 +39,7 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -rf $DIR/testfile1
-
 expect_normal_exit\
     ./obj_basic_integration$EXESUFFIX $DIR/testfile1
 
-rm -rf $DIR/testfile1
-
 pass
diff --git a/src/test/obj_debug/TEST0 b/src/test/obj_debug/TEST0
index 7b2214ba5..dd60862cd 100755
--- a/src/test/obj_debug/TEST0
+++ b/src/test/obj_debug/TEST0
@@ -44,13 +44,9 @@ require_build_type debug
 
 setup
 
-rm -f $DIR/testfile1
-
 export PMEMOBJ_LOG_LEVEL=4
 expect_normal_exit ./obj_debug$EXESUFFIX $DIR/testfile1 f
 
-rm -f $DIR/testfile1
-
 grep _pobj_debug_notice ./pmemobj$UNITTEST_NUM.log > grep$UNITTEST_NUM.log
 
 check
diff --git a/src/test/obj_debug/TEST1 b/src/test/obj_debug/TEST1
index 33371668f..189aa15df 100755
--- a/src/test/obj_debug/TEST1
+++ b/src/test/obj_debug/TEST1
@@ -44,13 +44,9 @@ require_build_type debug
 
 setup
 
-rm -f $DIR/testfile1
-
 export PMEMOBJ_LOG_LEVEL=4
 expect_normal_exit ./obj_debug$EXESUFFIX $DIR/testfile1 l
 
-rm -f $DIR/testfile1
-
 grep _pobj_debug_notice ./pmemobj$UNITTEST_NUM.log > grep$UNITTEST_NUM.log
 
 check
diff --git a/src/test/obj_debug/TEST2 b/src/test/obj_debug/TEST2
index 5693620de..4e2e8313b 100755
--- a/src/test/obj_debug/TEST2
+++ b/src/test/obj_debug/TEST2
@@ -44,13 +44,9 @@ require_build_type debug
 
 setup
 
-rm -f $DIR/testfile1
-
 export PMEMOBJ_LOG_LEVEL=4
 expect_normal_exit ./obj_debug$EXESUFFIX $DIR/testfile1 r
 
-rm -f $DIR/testfile1
-
 grep "is already in undo log" ./pmemobj$UNITTEST_NUM.log > grep$UNITTEST_NUM.log
 
 check
diff --git a/src/test/obj_direct/TEST0 b/src/test/obj_direct/TEST0
index b8a132b90..e296ae17c 100755
--- a/src/test/obj_direct/TEST0
+++ b/src/test/obj_direct/TEST0
@@ -46,6 +46,4 @@ setup
 
 expect_normal_exit ./obj_direct$EXESUFFIX $DIR 9
 
-rm -f $DIR/testfile*
-
 pass
diff --git a/src/test/obj_list/TEST0 b/src/test/obj_list/TEST0
index 40e170d8c..41e1b3d27 100755
--- a/src/test/obj_list/TEST0
+++ b/src/test/obj_list/TEST0
@@ -42,6 +42,4 @@ export UNITTEST_NUM=0
 # standard unit test setup
 . ../unittest/unittest.sh
 
-setup
-
 pass
diff --git a/src/test/obj_list_insert/TEST0 b/src/test/obj_list_insert/TEST0
index c9a8f2fa9..926f5395e 100755
--- a/src/test/obj_list_insert/TEST0
+++ b/src/test/obj_list_insert/TEST0
@@ -44,7 +44,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:0 P:2 R:2\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:0 P:2 R:2\
 	i:0:0 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert/TEST1 b/src/test/obj_list_insert/TEST1
index cf2c2925d..2f6e93f0f 100755
--- a/src/test/obj_list_insert/TEST1
+++ b/src/test/obj_list_insert/TEST1
@@ -44,7 +44,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:0 P:2 R:2\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:0 P:2 R:2\
 	i:1:0 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert/TEST2 b/src/test/obj_list_insert/TEST2
index a459348d5..c81a3086d 100755
--- a/src/test/obj_list_insert/TEST2
+++ b/src/test/obj_list_insert/TEST2
@@ -44,7 +44,6 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:-1 P:2 R:2\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:-1 P:2 R:2\
 	i:0:-1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert/TEST3 b/src/test/obj_list_insert/TEST3
index 8c6b4485a..cee0c4735 100755
--- a/src/test/obj_list_insert/TEST3
+++ b/src/test/obj_list_insert/TEST3
@@ -44,7 +44,6 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:-1 P:2 R:2\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:-1 P:2 R:2\
 	i:1:-1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert/TEST4 b/src/test/obj_list_insert/TEST4
index a336af093..424363778 100755
--- a/src/test/obj_list_insert/TEST4
+++ b/src/test/obj_list_insert/TEST4
@@ -44,15 +44,12 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:-1 i:0:-1 i:0:-1 P:2 R:2\
 	i:0:1 P:2 R:2\
 	i:1:2 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert_new/TEST0 b/src/test/obj_list_insert_new/TEST0
index fe07e8d88..132703556 100755
--- a/src/test/obj_list_insert_new/TEST0
+++ b/src/test/obj_list_insert_new/TEST0
@@ -44,7 +44,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n P:1 R:1\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n P:1 R:1\
 	n P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert_new/TEST1 b/src/test/obj_list_insert_new/TEST1
index 4bd8a8a3d..50a03ee5c 100755
--- a/src/test/obj_list_insert_new/TEST1
+++ b/src/test/obj_list_insert_new/TEST1
@@ -44,7 +44,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 P:1 R:1 P:2 R:2\
@@ -52,8 +51,6 @@ expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:0:0 P:1 R:1 P:2 R:2\
 	n:0:0:3 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert_new/TEST2 b/src/test/obj_list_insert_new/TEST2
index 39e2f5616..857707f3c 100755
--- a/src/test/obj_list_insert_new/TEST2
+++ b/src/test/obj_list_insert_new/TEST2
@@ -44,15 +44,12 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:0:-1 P:1 R:1 P:2 R:2\
 	n:0:-1 P:1 R:1 P:2 R:2\
 	n:0:-1 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert_new/TEST3 b/src/test/obj_list_insert_new/TEST3
index 4bbf4e75f..0daea4a68 100755
--- a/src/test/obj_list_insert_new/TEST3
+++ b/src/test/obj_list_insert_new/TEST3
@@ -44,15 +44,12 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:-1 P:1 R:1 P:2 R:2\
 	n:1:-1 P:1 R:1 P:2 R:2\
 	n:1:-1 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_insert_new/TEST4 b/src/test/obj_list_insert_new/TEST4
index ca39ab279..2456bbe1b 100755
--- a/src/test/obj_list_insert_new/TEST4
+++ b/src/test/obj_list_insert_new/TEST4
@@ -44,15 +44,12 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_normal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:0:0 n:0:0 n:0:0 n:0:0 n:0:0 P:1 R:1 P:2 R:2\
 	n:1:2 P:1 R:1 P:2 R:2\
 	n:0:2 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_move/TEST0 b/src/test/obj_list_move/TEST0
index c47d4f1cf..e2d505e2f 100755
--- a/src/test/obj_list_move/TEST0
+++ b/src/test/obj_list_move/TEST0
@@ -42,7 +42,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:0 i:0:0 i:0:-1 i:0:-1 P:2 R:2 P:4 R:4\
@@ -51,9 +50,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	m:1:0:1 P:2 R:2 P:4 R:4\
 	m:0:0:-1 P:2 R:2 P:4 R:4
 
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_move/TEST1 b/src/test/obj_list_move/TEST1
index ab5b5c345..244c2be27 100755
--- a/src/test/obj_list_move/TEST1
+++ b/src/test/obj_list_move/TEST1
@@ -42,7 +42,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:0:0 i:0:0 i:0:-1 i:0:-1 P:2 R:2 P:4 R:4\
@@ -51,9 +50,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	m:1:1:1 P:2 R:2 P:4 R:4\
 	m:0:1:-1 P:2 R:2 P:4 R:4
 
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_move_oob/TEST0 b/src/test/obj_list_move_oob/TEST0
index db8e60263..4a44ad490 100755
--- a/src/test/obj_list_move_oob/TEST0
+++ b/src/test/obj_list_move_oob/TEST0
@@ -44,7 +44,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n n n P:1 R:1 P:3 R:3\
@@ -53,9 +52,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	o:-1 P:1 R:1 P:3 R:3\
 	o:0 P:1 R:1 P:3 R:3
 
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST0 b/src/test/obj_list_realloc/TEST0
index 9fce78456..ec0ddf0d7 100755
--- a/src/test/obj_list_realloc/TEST0
+++ b/src/test/obj_list_realloc/TEST0
@@ -45,14 +45,11 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n P:1 R:1\
 	s:0:1:1:2:1:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST1 b/src/test/obj_list_realloc/TEST1
index 34d94b4d2..d83da0d76 100755
--- a/src/test/obj_list_realloc/TEST1
+++ b/src/test/obj_list_realloc/TEST1
@@ -45,14 +45,11 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n P:1 R:1\
 	s:0:1:1:3:2:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST2 b/src/test/obj_list_realloc/TEST2
index b4932702a..98df68205 100755
--- a/src/test/obj_list_realloc/TEST2
+++ b/src/test/obj_list_realloc/TEST2
@@ -45,15 +45,12 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n P:1 R:1\
 	s:0:1:1:2:2:0 P:1 R:1\
 	s:1:1:1:2:3:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST3 b/src/test/obj_list_realloc/TEST3
index 6bcb72817..072bcea28 100755
--- a/src/test/obj_list_realloc/TEST3
+++ b/src/test/obj_list_realloc/TEST3
@@ -45,15 +45,12 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n P:1 R:1\
 	s:0:1:1:3:4:0 P:1 R:1\
 	s:1:1:1:3:5:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST4 b/src/test/obj_list_realloc/TEST4
index 9e90c2aa9..c1e6400ce 100755
--- a/src/test/obj_list_realloc/TEST4
+++ b/src/test/obj_list_realloc/TEST4
@@ -45,14 +45,11 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 P:1 R:1 P:2 R:2\
 	s:0:1:2:2:1:0 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST5 b/src/test/obj_list_realloc/TEST5
index 68b945c8d..77de1c3c9 100755
--- a/src/test/obj_list_realloc/TEST5
+++ b/src/test/obj_list_realloc/TEST5
@@ -45,14 +45,11 @@ export UNITTEST_NUM=5
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 P:1 R:1 P:2 R:2\
 	s:0:1:2:3:2:0 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST6 b/src/test/obj_list_realloc/TEST6
index 635304c70..d13557a88 100755
--- a/src/test/obj_list_realloc/TEST6
+++ b/src/test/obj_list_realloc/TEST6
@@ -45,15 +45,12 @@ export UNITTEST_NUM=6
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 P:1 R:1 P:2 R:2\
 	s:0:1:2:2:2:0 P:1 R:1 P:2 R:2\
 	s:1:1:2:2:3:1 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc/TEST7 b/src/test/obj_list_realloc/TEST7
index 81c2159f8..222db4531 100755
--- a/src/test/obj_list_realloc/TEST7
+++ b/src/test/obj_list_realloc/TEST7
@@ -45,15 +45,12 @@ export UNITTEST_NUM=7
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 P:1 R:1 P:2 R:2\
 	s:0:1:2:3:4:0 P:1 R:1 P:2 R:2 \
 	s:1:1:2:3:5:1 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc_move/TEST0 b/src/test/obj_list_realloc_move/TEST0
index cbe0de889..c8816d6f9 100755
--- a/src/test/obj_list_realloc_move/TEST0
+++ b/src/test/obj_list_realloc_move/TEST0
@@ -46,7 +46,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n n n\
@@ -56,9 +55,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	e:0:2:12:1:0\
 	P:1 R:1 P:2 R:2 P:3 R:3
 
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_realloc_move/TEST1 b/src/test/obj_list_realloc_move/TEST1
index 1cb305bd9..fbd5087d2 100755
--- a/src/test/obj_list_realloc_move/TEST1
+++ b/src/test/obj_list_realloc_move/TEST1
@@ -46,7 +46,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 n:1:0 n:1:0\
@@ -56,10 +55,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	e:1:3:12:0:1\
 	P:1 R:1 P:2 R:2 P:3 R:3
 
-
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST0 b/src/test/obj_list_recovery/TEST0
index c6e7ec9a4..b157f3e74 100755
--- a/src/test/obj_list_recovery/TEST0
+++ b/src/test/obj_list_recovery/TEST0
@@ -42,7 +42,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -87,8 +86,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST1 b/src/test/obj_list_recovery/TEST1
index 26fdbe9e4..c8b4fcbd5 100755
--- a/src/test/obj_list_recovery/TEST1
+++ b/src/test/obj_list_recovery/TEST1
@@ -42,7 +42,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -88,8 +87,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST2 b/src/test/obj_list_recovery/TEST2
index d9571e2ae..869ed4aed 100755
--- a/src/test/obj_list_recovery/TEST2
+++ b/src/test/obj_list_recovery/TEST2
@@ -42,7 +42,6 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -106,8 +105,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST3 b/src/test/obj_list_recovery/TEST3
index d3bdcae22..67da0a149 100755
--- a/src/test/obj_list_recovery/TEST3
+++ b/src/test/obj_list_recovery/TEST3
@@ -42,7 +42,6 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -89,8 +88,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST4 b/src/test/obj_list_recovery/TEST4
index e5d4de589..cb8439fbb 100755
--- a/src/test/obj_list_recovery/TEST4
+++ b/src/test/obj_list_recovery/TEST4
@@ -42,7 +42,6 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -88,8 +87,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST5 b/src/test/obj_list_recovery/TEST5
index d62442c37..87f0ca01a 100755
--- a/src/test/obj_list_recovery/TEST5
+++ b/src/test/obj_list_recovery/TEST5
@@ -42,7 +42,6 @@ export UNITTEST_NUM=5
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -88,8 +87,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST6 b/src/test/obj_list_recovery/TEST6
index 56d693522..38a629a1b 100755
--- a/src/test/obj_list_recovery/TEST6
+++ b/src/test/obj_list_recovery/TEST6
@@ -42,7 +42,6 @@ export UNITTEST_NUM=6
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -156,8 +155,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_recovery/TEST7 b/src/test/obj_list_recovery/TEST7
index 4bdfa5c15..7f90686ae 100755
--- a/src/test/obj_list_recovery/TEST7
+++ b/src/test/obj_list_recovery/TEST7
@@ -42,7 +42,6 @@ export UNITTEST_NUM=7
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 rm -f log${UNITTEST_NUM}.log
@@ -156,8 +155,6 @@ expect_normal_exit\
 
 concat_log
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove/TEST0 b/src/test/obj_list_remove/TEST0
index ec6ffd693..9be67178e 100755
--- a/src/test/obj_list_remove/TEST0
+++ b/src/test/obj_list_remove/TEST0
@@ -45,7 +45,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:0 i:1:0 i:1:0 i:1:0 P:2 R:2\
@@ -54,8 +53,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	r:0 P:2 R:2\
 	r:0 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove/TEST1 b/src/test/obj_list_remove/TEST1
index 09ae5e739..31c882e06 100755
--- a/src/test/obj_list_remove/TEST1
+++ b/src/test/obj_list_remove/TEST1
@@ -45,7 +45,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:0 i:1:0 i:1:0 i:1:0 P:2 R:2\
@@ -54,8 +53,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	r:-1 P:2 R:2\
 	r:-1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove/TEST2 b/src/test/obj_list_remove/TEST2
index d1eb3d122..66c7234dc 100755
--- a/src/test/obj_list_remove/TEST2
+++ b/src/test/obj_list_remove/TEST2
@@ -44,14 +44,11 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	i:1:0 i:1:0 i:1:0 P:2 R:2\
 	r:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove/TEST3 b/src/test/obj_list_remove/TEST3
index 2a76b59c1..04e6380dd 100755
--- a/src/test/obj_list_remove/TEST3
+++ b/src/test/obj_list_remove/TEST3
@@ -44,15 +44,12 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 n:1:0 P:1 R:1 P:2 R:2\
 	f:1:0:2 f:1:0:2 f:1:0:2 P:1 R:1 P:2 R:2\
 	n:1:0 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove_free/TEST0 b/src/test/obj_list_remove_free/TEST0
index aa3a763d3..ab4df5179 100755
--- a/src/test/obj_list_remove_free/TEST0
+++ b/src/test/obj_list_remove_free/TEST0
@@ -45,7 +45,6 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n n n P:1 R:1\
@@ -54,8 +53,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	f:1:0:1 P:1 R:1\
 	f:1:0:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove_free/TEST1 b/src/test/obj_list_remove_free/TEST1
index bdfbb6138..b6febf944 100755
--- a/src/test/obj_list_remove_free/TEST1
+++ b/src/test/obj_list_remove_free/TEST1
@@ -45,7 +45,6 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 n:1:0 n:1:0 P:1 R:1\
@@ -54,8 +53,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	f:1:-1:1 P:1 R:1\
 	f:1:-1:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove_free/TEST2 b/src/test/obj_list_remove_free/TEST2
index 7b41230c3..62d7a6a07 100755
--- a/src/test/obj_list_remove_free/TEST2
+++ b/src/test/obj_list_remove_free/TEST2
@@ -44,14 +44,11 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n n P:1 R:1\
 	f:1:1:1 P:1 R:1
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove_free/TEST3 b/src/test/obj_list_remove_free/TEST3
index 76fa769d2..a591b61ab 100755
--- a/src/test/obj_list_remove_free/TEST3
+++ b/src/test/obj_list_remove_free/TEST3
@@ -49,7 +49,6 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n:1:0 n:1:0 n:1:0 n:1:0 P:1 R:1 P:2 R:2\
@@ -58,8 +57,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	f:1:-1:2 P:1 R:1 P:2 R:2\
 	f:1:0:2 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_remove_free/TEST4 b/src/test/obj_list_remove_free/TEST4
index d280ecc2f..1ae286d2a 100755
--- a/src/test/obj_list_remove_free/TEST4
+++ b/src/test/obj_list_remove_free/TEST4
@@ -48,7 +48,6 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	n n n:1:0 n:1:0 n:1:0 P:1 R:1 P:2 R:2\
@@ -56,8 +55,6 @@ expect_abnormal_exit ../obj_list/obj_list$EXESUFFIX $DIR/testfile\
 	f:2:-1:2 P:1 R:1 P:2 R:2\
 	f:2:0:2 P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST0 b/src/test/obj_list_valgrind/TEST0
index 306c2dda8..1051c9f62 100755
--- a/src/test/obj_list_valgrind/TEST0
+++ b/src/test/obj_list_valgrind/TEST0
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -61,8 +60,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		n:0:1\
 		P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST1 b/src/test/obj_list_valgrind/TEST1
index ee285f049..99cf68a8d 100755
--- a/src/test/obj_list_valgrind/TEST1
+++ b/src/test/obj_list_valgrind/TEST1
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -61,8 +60,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		i:1:2\
 		P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST2 b/src/test/obj_list_valgrind/TEST2
index 6b346e79c..06c8751b1 100755
--- a/src/test/obj_list_valgrind/TEST2
+++ b/src/test/obj_list_valgrind/TEST2
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
diff --git a/src/test/obj_list_valgrind/TEST3 b/src/test/obj_list_valgrind/TEST3
index 08c4943ba..5c1ab2ac2 100755
--- a/src/test/obj_list_valgrind/TEST3
+++ b/src/test/obj_list_valgrind/TEST3
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
diff --git a/src/test/obj_list_valgrind/TEST4 b/src/test/obj_list_valgrind/TEST4
index e74d3702d..247589e6f 100755
--- a/src/test/obj_list_valgrind/TEST4
+++ b/src/test/obj_list_valgrind/TEST4
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -61,8 +60,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		n:0:1:15\
 		P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST5 b/src/test/obj_list_valgrind/TEST5
index 10b388548..2f228aaab 100755
--- a/src/test/obj_list_valgrind/TEST5
+++ b/src/test/obj_list_valgrind/TEST5
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -64,8 +63,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		m:0:0:2\
 		P:2 R:2 P:4 R:4
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST6 b/src/test/obj_list_valgrind/TEST6
index 7a6541bf0..e029be5a7 100755
--- a/src/test/obj_list_valgrind/TEST6
+++ b/src/test/obj_list_valgrind/TEST6
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -61,8 +60,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		o:0\
 		P:1 R:1 P:3 R:3
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST7 b/src/test/obj_list_valgrind/TEST7
index 82f08e3a0..8aac66ec0 100755
--- a/src/test/obj_list_valgrind/TEST7
+++ b/src/test/obj_list_valgrind/TEST7
@@ -46,7 +46,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -65,8 +64,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 		s:2:1:2:3:22:0\
 		P:1 R:1 P:2 R:2
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_list_valgrind/TEST8 b/src/test/obj_list_valgrind/TEST8
index 41c9541d0..407ae3a0c 100755
--- a/src/test/obj_list_valgrind/TEST8
+++ b/src/test/obj_list_valgrind/TEST8
@@ -45,7 +45,6 @@ require_valgrind_pmemcheck ../obj_list/obj_list
 
 setup
 
-rm -f $DIR/testfile
 truncate -s1M $DIR/testfile
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -59,9 +58,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 	e:0:2:13:1:1\
 	P:1 R:1 P:2 R:2 P:3 R:3
 
-
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST0 b/src/test/obj_pool/TEST0
index ec97f5bde..08b1a46cd 100755
--- a/src/test/obj_pool/TEST0
+++ b/src/test/obj_pool/TEST0
@@ -43,8 +43,6 @@ export UNITTEST_NUM=0
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST0 non-existing file, poolsize > 0
 #
@@ -55,8 +53,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST1 b/src/test/obj_pool/TEST1
index 6f4e24002..8055850bd 100755
--- a/src/test/obj_pool/TEST1
+++ b/src/test/obj_pool/TEST1
@@ -43,7 +43,6 @@ export UNITTEST_NUM=1
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST10 b/src/test/obj_pool/TEST10
index c70331467..8f77e50e9 100755
--- a/src/test/obj_pool/TEST10
+++ b/src/test/obj_pool/TEST10
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0240 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST11 b/src/test/obj_pool/TEST11
index cbd373f80..c78b240d2 100755
--- a/src/test/obj_pool/TEST11
+++ b/src/test/obj_pool/TEST11
@@ -45,7 +45,6 @@ require_no_superuser
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0440 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
     exit 1
 }
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST12 b/src/test/obj_pool/TEST12
index d1cd749fa..2a4241e5d 100755
--- a/src/test/obj_pool/TEST12
+++ b/src/test/obj_pool/TEST12
@@ -43,8 +43,6 @@ export UNITTEST_NUM=12
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST12 non-existing file, poolsize >= min required size
 #        layout is NULL
@@ -56,8 +54,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile NULL 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST13 b/src/test/obj_pool/TEST13
index 903dc8bd2..ac402f8b1 100755
--- a/src/test/obj_pool/TEST13
+++ b/src/test/obj_pool/TEST13
@@ -43,8 +43,6 @@ export UNITTEST_NUM=13
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST13 non-existing file, poolsize >= min required size
 #        layout is empty string
@@ -56,8 +54,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile EMPTY 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST14 b/src/test/obj_pool/TEST14
index 16b8a5772..30da7f431 100755
--- a/src/test/obj_pool/TEST14
+++ b/src/test/obj_pool/TEST14
@@ -43,8 +43,6 @@ export UNITTEST_NUM=14
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST14 non-existing file, poolsize >= min required size
 #        layout string is too long
diff --git a/src/test/obj_pool/TEST2 b/src/test/obj_pool/TEST2
index ae8f51594..eae655c13 100755
--- a/src/test/obj_pool/TEST2
+++ b/src/test/obj_pool/TEST2
@@ -43,8 +43,6 @@ export UNITTEST_NUM=2
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST2 non-existing file, poolsize == 0
 #
diff --git a/src/test/obj_pool/TEST20 b/src/test/obj_pool/TEST20
index 3f04a6cb0..023ad5479 100755
--- a/src/test/obj_pool/TEST20
+++ b/src/test/obj_pool/TEST20
@@ -43,8 +43,6 @@ export UNITTEST_NUM=20
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST20 non-existing file, layout is NULL
 #
diff --git a/src/test/obj_pool/TEST21 b/src/test/obj_pool/TEST21
index efcaf57e4..517f84542 100755
--- a/src/test/obj_pool/TEST21
+++ b/src/test/obj_pool/TEST21
@@ -43,7 +43,6 @@ export UNITTEST_NUM=21
 setup
 umask 0
 
-rm -f $DIR/testfile
 create_holey_file 1 $DIR/testfile
 
 #
@@ -51,8 +50,6 @@ create_holey_file 1 $DIR/testfile
 #
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST22 b/src/test/obj_pool/TEST22
index c1134a9a8..dd592f491 100755
--- a/src/test/obj_pool/TEST22
+++ b/src/test/obj_pool/TEST22
@@ -43,8 +43,6 @@ export UNITTEST_NUM=22
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST22 existing file, file size < min required size, layout is NULL
 #        (valid pool header)
@@ -54,8 +52,6 @@ truncate -s 1M $DIR/testfile
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST23 b/src/test/obj_pool/TEST23
index b750a7aa4..779459fc2 100755
--- a/src/test/obj_pool/TEST23
+++ b/src/test/obj_pool/TEST23
@@ -43,7 +43,6 @@ export UNITTEST_NUM=23
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 
 #
@@ -52,8 +51,6 @@ truncate -s 2G $DIR/testfile
 #
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST24 b/src/test/obj_pool/TEST24
index 646c78bb8..1de2afa6d 100755
--- a/src/test/obj_pool/TEST24
+++ b/src/test/obj_pool/TEST24
@@ -43,8 +43,6 @@ export UNITTEST_NUM=24
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST24 existing file, file size >= min required size, layout is ""
 #        (layout doesn't match the value from pool header)
@@ -53,8 +51,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile EMPTY
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST25 b/src/test/obj_pool/TEST25
index b52eb8e22..f393d1c43 100755
--- a/src/test/obj_pool/TEST25
+++ b/src/test/obj_pool/TEST25
@@ -43,8 +43,6 @@ export UNITTEST_NUM=25
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST25 existing file, file size >= min required size, layout is NULL
 #        (no read permissions)
@@ -54,8 +52,6 @@ chmod -r $DIR/testfile
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST26 b/src/test/obj_pool/TEST26
index 930a85eaa..6a1aebd7f 100755
--- a/src/test/obj_pool/TEST26
+++ b/src/test/obj_pool/TEST26
@@ -43,8 +43,6 @@ export UNITTEST_NUM=26
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST26 existing file, file size >= min required size, layout is NULL
 #        (no write permissions)
@@ -54,8 +52,6 @@ chmod -w $DIR/testfile
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST27 b/src/test/obj_pool/TEST27
index 2d88e8b4d..aa206675c 100755
--- a/src/test/obj_pool/TEST27
+++ b/src/test/obj_pool/TEST27
@@ -43,8 +43,6 @@ export UNITTEST_NUM=27
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST27 existing file, file size >= min required size, layout is NULL
 #
@@ -52,8 +50,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile NULL
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST28 b/src/test/obj_pool/TEST28
index d29f59d3d..b9c6dd1b0 100755
--- a/src/test/obj_pool/TEST28
+++ b/src/test/obj_pool/TEST28
@@ -43,8 +43,6 @@ export UNITTEST_NUM=28
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST28 existing file, file size >= min required size
 #        layout matches the value from pool header
@@ -53,8 +51,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
 
 expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile "test"
 
-rm -f $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST3 b/src/test/obj_pool/TEST3
index 7a944168c..0708815cc 100755
--- a/src/test/obj_pool/TEST3
+++ b/src/test/obj_pool/TEST3
@@ -43,7 +43,6 @@ export UNITTEST_NUM=3
 setup
 umask 0
 
-rm -f $DIR/testfile
 truncate -s 2G $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST4 b/src/test/obj_pool/TEST4
index dcc7ca6e5..327d430a8 100755
--- a/src/test/obj_pool/TEST4
+++ b/src/test/obj_pool/TEST4
@@ -43,7 +43,6 @@ export UNITTEST_NUM=4
 setup
 umask 0
 
-rm -f $DIR/testfile
 touch $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -57,8 +56,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST5 b/src/test/obj_pool/TEST5
index a433c8ff6..9f08d971e 100755
--- a/src/test/obj_pool/TEST5
+++ b/src/test/obj_pool/TEST5
@@ -43,8 +43,6 @@ export UNITTEST_NUM=5
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST5 non-existing file, poolsize > 0
 #       path is invalid (directory not exist)
diff --git a/src/test/obj_pool/TEST6 b/src/test/obj_pool/TEST6
index 5d86683ec..506edc367 100755
--- a/src/test/obj_pool/TEST6
+++ b/src/test/obj_pool/TEST6
@@ -43,7 +43,6 @@ export UNITTEST_NUM=6
 setup
 umask 0
 
-rm -f $DIR/testfile
 touch $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -60,8 +59,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile $LAYOUT 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST7 b/src/test/obj_pool/TEST7
index 677e8ac62..99d48b0fc 100755
--- a/src/test/obj_pool/TEST7
+++ b/src/test/obj_pool/TEST7
@@ -43,8 +43,6 @@ export UNITTEST_NUM=7
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 8 0 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST8 b/src/test/obj_pool/TEST8
index 0ca823ecb..c44e735ac 100755
--- a/src/test/obj_pool/TEST8
+++ b/src/test/obj_pool/TEST8
@@ -43,8 +43,6 @@ export UNITTEST_NUM=8
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 create_nonzeroed_file 8 8 $DIR/testfile
 chmod 0640 $DIR/testfile
 
@@ -59,8 +57,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 0 0640
     exit 1
 }
 
-rm $DIR/testfile
-
 check
 
 pass
diff --git a/src/test/obj_pool/TEST9 b/src/test/obj_pool/TEST9
index d5ba9bcf5..f8172018c 100755
--- a/src/test/obj_pool/TEST9
+++ b/src/test/obj_pool/TEST9
@@ -43,8 +43,6 @@ export UNITTEST_NUM=9
 setup
 umask 0
 
-rm -f $DIR/testfile
-
 #
 # TEST9 non-existing file, poolsize < min required size
 #
diff --git a/src/test/obj_recovery/TEST0 b/src/test/obj_recovery/TEST0
index aa0b128cf..32eba31b3 100755
--- a/src/test/obj_recovery/TEST0
+++ b/src/test/obj_recovery/TEST0
@@ -45,6 +45,4 @@ setup
 expect_normal_exit ./obj_recovery$EXESUFFIX $DIR/testfile
 expect_normal_exit ./obj_recovery$EXESUFFIX $DIR/testfile
 
-rm -f $DIR/testfile
-
 pass
diff --git a/src/test/obj_redo_log/TEST0 b/src/test/obj_redo_log/TEST0
index ad0ad4997..44e631b13 100755
--- a/src/test/obj_redo_log/TEST0
+++ b/src/test/obj_redo_log/TEST0
@@ -47,7 +47,6 @@ AREASIZE=4096
 FSIZE=$(($AREASIZE + 8192))
 RSIZE=$(($AREASIZE / 16))
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -68,8 +67,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	e:2\
 	e:3
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST1 b/src/test/obj_redo_log/TEST1
index 3b621978f..6084ba8ec 100755
--- a/src/test/obj_redo_log/TEST1
+++ b/src/test/obj_redo_log/TEST1
@@ -47,7 +47,6 @@ AREASIZE=4096
 FSIZE=$(($AREASIZE + 8192))
 RSIZE=$(($AREASIZE / 16))
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -68,8 +67,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	e:2\
 	e:3
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST2 b/src/test/obj_redo_log/TEST2
index e1ab9d4eb..ae0a5c895 100755
--- a/src/test/obj_redo_log/TEST2
+++ b/src/test/obj_redo_log/TEST2
@@ -47,7 +47,6 @@ AREASIZE=4096
 FSIZE=$(($AREASIZE + 8192))
 RSIZE=$(($AREASIZE / 16))
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -95,8 +94,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	f:4:0x00000050:0xaaaaaaaa\
 	C
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST3 b/src/test/obj_redo_log/TEST3
index 55f063b10..e6acc209e 100755
--- a/src/test/obj_redo_log/TEST3
+++ b/src/test/obj_redo_log/TEST3
@@ -46,7 +46,6 @@ FILE=${DIR}/pool
 FSIZE=$((1024*1024))
 RSIZE=4
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -93,8 +92,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	e:3\
 	C
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST4 b/src/test/obj_redo_log/TEST4
index b5266dfdf..7752fc210 100755
--- a/src/test/obj_redo_log/TEST4
+++ b/src/test/obj_redo_log/TEST4
@@ -46,7 +46,6 @@ FILE=${DIR}/pool
 FSIZE=$((1024*1024))
 RSIZE=4
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -97,8 +96,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	e:3\
 	C
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST5 b/src/test/obj_redo_log/TEST5
index 01a111f58..74af3a30f 100755
--- a/src/test/obj_redo_log/TEST5
+++ b/src/test/obj_redo_log/TEST5
@@ -47,7 +47,6 @@ AREASIZE=4096
 FSIZE=$(($AREASIZE + 8192))
 RSIZE=$(($AREASIZE / 16))
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
@@ -72,8 +71,6 @@ expect_normal_exit ./obj_redo_log$EXESUFFIX $FILE $RSIZE\
 	e:2\
 	e:3
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_redo_log/TEST6 b/src/test/obj_redo_log/TEST6
index b1327aef5..6f3dd86e8 100755
--- a/src/test/obj_redo_log/TEST6
+++ b/src/test/obj_redo_log/TEST6
@@ -49,7 +49,6 @@ FILE=${DIR}/pool
 FSIZE=$((1024*1024))
 RSIZE=4
 
-rm -f $FILE
 truncate -s $FSIZE $FILE
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -78,8 +77,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 	r:0x00000318\
 	C
 
-rm -f $FILE
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST0 b/src/test/obj_store/TEST0
index dbc80eb92..74a503e47 100755
--- a/src/test/obj_store/TEST0
+++ b/src/test/obj_store/TEST0
@@ -44,14 +44,10 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 r
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST1 b/src/test/obj_store/TEST1
index 7c4cf2785..73b28059d 100755
--- a/src/test/obj_store/TEST1
+++ b/src/test/obj_store/TEST1
@@ -46,14 +46,10 @@ export UNITTEST_NUM=1
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 a
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST2 b/src/test/obj_store/TEST2
index 5a3833457..06e8fd73d 100755
--- a/src/test/obj_store/TEST2
+++ b/src/test/obj_store/TEST2
@@ -45,14 +45,10 @@ export UNITTEST_NUM=2
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 f
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST3 b/src/test/obj_store/TEST3
index 6e00bd3b5..ca29e7e3c 100755
--- a/src/test/obj_store/TEST3
+++ b/src/test/obj_store/TEST3
@@ -45,14 +45,10 @@ export UNITTEST_NUM=3
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 u
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST4 b/src/test/obj_store/TEST4
index 99e1d2179..288f48e5e 100755
--- a/src/test/obj_store/TEST4
+++ b/src/test/obj_store/TEST4
@@ -46,14 +46,10 @@ export UNITTEST_NUM=4
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 n
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_store/TEST5 b/src/test/obj_store/TEST5
index 568d9bbba..e1387006a 100755
--- a/src/test/obj_store/TEST5
+++ b/src/test/obj_store/TEST5
@@ -42,14 +42,10 @@ export UNITTEST_NUM=5
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 4 $DIR/testfile1
 
 expect_normal_exit ./obj_store$EXESUFFIX $DIR/testfile1 s
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_add_range/TEST0 b/src/test/obj_tx_add_range/TEST0
index 47f68d68f..75d25c720 100755
--- a/src/test/obj_tx_add_range/TEST0
+++ b/src/test/obj_tx_add_range/TEST0
@@ -42,12 +42,8 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 expect_normal_exit ./obj_tx_add_range$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_add_range/TEST1 b/src/test/obj_tx_add_range/TEST1
index b8dad9fee..4cc80b7ec 100755
--- a/src/test/obj_tx_add_range/TEST1
+++ b/src/test/obj_tx_add_range/TEST1
@@ -46,13 +46,11 @@ require_valgrind_pmemcheck
 
 setup
 
-rm -f $DIR/testfile1
 expect_normal_exit valgrind --tool=pmemcheck\
 	--log-file=valgrind$UNITTEST_NUM.log\
 	--mult-stores=no\
 	./obj_tx_add_range$EXESUFFIX $DIR/testfile1 $i
 
-rm -f $DIR/testfile1
 check
 
 pass
diff --git a/src/test/obj_tx_add_range_direct/TEST0 b/src/test/obj_tx_add_range_direct/TEST0
index 8e47d02b6..827c903e5 100755
--- a/src/test/obj_tx_add_range_direct/TEST0
+++ b/src/test/obj_tx_add_range_direct/TEST0
@@ -43,12 +43,8 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 expect_normal_exit ./obj_tx_add_range_direct$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_add_range_direct/TEST1 b/src/test/obj_tx_add_range_direct/TEST1
index 858841fd3..162da59da 100755
--- a/src/test/obj_tx_add_range_direct/TEST1
+++ b/src/test/obj_tx_add_range_direct/TEST1
@@ -46,13 +46,11 @@ require_valgrind_pmemcheck
 
 setup
 
-rm -f $DIR/testfile1
 expect_normal_exit valgrind --tool=pmemcheck\
 	--log-file=valgrind$UNITTEST_NUM.log\
 	--mult-stores=no\
 	./obj_tx_add_range_direct$EXESUFFIX $DIR/testfile1 $i
 
-rm -f $DIR/testfile1
 check
 
 pass
diff --git a/src/test/obj_tx_alloc/TEST0 b/src/test/obj_tx_alloc/TEST0
index 02fff4da5..cb5492356 100755
--- a/src/test/obj_tx_alloc/TEST0
+++ b/src/test/obj_tx_alloc/TEST0
@@ -42,14 +42,10 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 8 $DIR/testfile1
 
 expect_normal_exit ./obj_tx_alloc$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_alloc/TEST1 b/src/test/obj_tx_alloc/TEST1
index 1ffcdf644..3f5878e62 100755
--- a/src/test/obj_tx_alloc/TEST1
+++ b/src/test/obj_tx_alloc/TEST1
@@ -46,8 +46,6 @@ require_valgrind_pmemcheck
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 8 $DIR/testfile1
 
 expect_normal_exit valgrind --tool=pmemcheck\
@@ -55,7 +53,6 @@ expect_normal_exit valgrind --tool=pmemcheck\
 	--mult-stores=no\
 	./obj_tx_alloc$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
 check
 
 pass
diff --git a/src/test/obj_tx_flow/TEST0 b/src/test/obj_tx_flow/TEST0
index 057cc9635..d679abed4 100755
--- a/src/test/obj_tx_flow/TEST0
+++ b/src/test/obj_tx_flow/TEST0
@@ -44,6 +44,4 @@ setup
 
 expect_normal_exit ./obj_tx_flow$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 pass
diff --git a/src/test/obj_tx_free/TEST0 b/src/test/obj_tx_free/TEST0
index cb7eb2f31..4b92eb19d 100755
--- a/src/test/obj_tx_free/TEST0
+++ b/src/test/obj_tx_free/TEST0
@@ -42,12 +42,8 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 expect_normal_exit ./obj_tx_free$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_free/TEST1 b/src/test/obj_tx_free/TEST1
index d0f3b56fe..21f29b19c 100755
--- a/src/test/obj_tx_free/TEST1
+++ b/src/test/obj_tx_free/TEST1
@@ -46,13 +46,11 @@ require_valgrind_pmemcheck
 
 setup
 
-rm -f $DIR/testfile1
 expect_normal_exit valgrind --tool=pmemcheck\
 	--log-file=valgrind$UNITTEST_NUM.log\
 	--mult-stores=no\
 	./obj_tx_free$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
 check
 
 pass
diff --git a/src/test/obj_tx_locks/TEST0 b/src/test/obj_tx_locks/TEST0
index c1f7be8f5..d21df28f2 100755
--- a/src/test/obj_tx_locks/TEST0
+++ b/src/test/obj_tx_locks/TEST0
@@ -44,6 +44,4 @@ setup
 
 expect_normal_exit ./obj_tx_locks$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 pass
diff --git a/src/test/obj_tx_locks/TEST1 b/src/test/obj_tx_locks/TEST1
index 44f44c309..2a986ab50 100755
--- a/src/test/obj_tx_locks/TEST1
+++ b/src/test/obj_tx_locks/TEST1
@@ -54,8 +54,6 @@ setup
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log --tool=drd\
  ./obj_tx_locks$EXESUFFIX $DIR/testfile1 m
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_locks/TEST2 b/src/test/obj_tx_locks/TEST2
index 5b596a816..1698e2be1 100755
--- a/src/test/obj_tx_locks/TEST2
+++ b/src/test/obj_tx_locks/TEST2
@@ -54,8 +54,6 @@ setup
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log\
  --tool=helgrind ./obj_tx_locks$EXESUFFIX $DIR/testfile1 m
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_locks_abort/TEST0 b/src/test/obj_tx_locks_abort/TEST0
index a2331c725..841cc067f 100755
--- a/src/test/obj_tx_locks_abort/TEST0
+++ b/src/test/obj_tx_locks_abort/TEST0
@@ -42,12 +42,8 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 expect_normal_exit ./obj_tx_locks_abort$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_locks_abort/TEST1 b/src/test/obj_tx_locks_abort/TEST1
index 97ae033fe..46c1f471f 100755
--- a/src/test/obj_tx_locks_abort/TEST1
+++ b/src/test/obj_tx_locks_abort/TEST1
@@ -54,8 +54,6 @@ setup
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log --tool=drd\
  ./obj_tx_locks_abort$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_locks_abort/TEST2 b/src/test/obj_tx_locks_abort/TEST2
index 6fb3083c8..d4b43ec45 100755
--- a/src/test/obj_tx_locks_abort/TEST2
+++ b/src/test/obj_tx_locks_abort/TEST2
@@ -54,8 +54,6 @@ setup
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log\
  --tool=helgrind ./obj_tx_locks_abort$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_realloc/TEST0 b/src/test/obj_tx_realloc/TEST0
index 2641bdfa7..8a9b8441f 100755
--- a/src/test/obj_tx_realloc/TEST0
+++ b/src/test/obj_tx_realloc/TEST0
@@ -42,14 +42,10 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 create_nonzeroed_file 8 8 $DIR/testfile1
 
 expect_normal_exit ./obj_tx_realloc$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/obj_tx_strdup/TEST0 b/src/test/obj_tx_strdup/TEST0
index ce6e2938a..ceaa8ae69 100755
--- a/src/test/obj_tx_strdup/TEST0
+++ b/src/test/obj_tx_strdup/TEST0
@@ -42,12 +42,8 @@ export UNITTEST_NUM=0
 
 setup
 
-rm -f $DIR/testfile1
-
 expect_normal_exit ./obj_tx_strdup$EXESUFFIX $DIR/testfile1
 
-rm -f $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/out_err_mt/TEST0 b/src/test/out_err_mt/TEST0
index 26da1949d..2846c3f74 100755
--- a/src/test/out_err_mt/TEST0
+++ b/src/test/out_err_mt/TEST0
@@ -44,15 +44,9 @@ require_fs_type local
 
 setup
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testfile3
-
 expect_normal_exit ./out_err_mt$EXESUFFIX \
 	$DIR/testfile1 $DIR/testfile2 $DIR/testfile3
 
-rm -f $DIR/testfile[123]
-
 check
 
 pass
diff --git a/src/test/out_err_mt/TEST1 b/src/test/out_err_mt/TEST1
index ca4612138..2b6000c10 100755
--- a/src/test/out_err_mt/TEST1
+++ b/src/test/out_err_mt/TEST1
@@ -55,15 +55,9 @@ unset PMEMLOG_LOG_FILE
 unset PMEMBLK_LOG_FILE
 unset PMEMOBJ_LOG_FILE
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testfile3
-
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log --tool=drd\
     ./out_err_mt$EXESUFFIX $DIR/testfile1 $DIR/testfile2 $DIR/testfile3
 
-rm -f $DIR/testfile[123]
-
 check
 
 pass
diff --git a/src/test/out_err_mt/TEST2 b/src/test/out_err_mt/TEST2
index 1b352fc73..aecff5c3c 100755
--- a/src/test/out_err_mt/TEST2
+++ b/src/test/out_err_mt/TEST2
@@ -55,15 +55,9 @@ unset PMEMLOG_LOG_FILE
 unset PMEMBLK_LOG_FILE
 unset PMEMOBJ_LOG_FILE
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testfile3
-
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log --tool=helgrind\
     ./out_err_mt$EXESUFFIX $DIR/testfile1 $DIR/testfile2 $DIR/testfile3
 
-rm -f $DIR/testfile[123]
-
 check
 
 pass
diff --git a/src/test/pmem_is_pmem/TEST0 b/src/test/pmem_is_pmem/TEST0
index b078038b8..e67a5645b 100755
--- a/src/test/pmem_is_pmem/TEST0
+++ b/src/test/pmem_is_pmem/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,10 +44,8 @@ require_fs_type non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 expect_normal_exit ./pmem_is_pmem$EXESUFFIX $DIR/testfile1
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/pmem_is_pmem/TEST1 b/src/test/pmem_is_pmem/TEST1
index 0f1f41c1d..227e55058 100755
--- a/src/test/pmem_is_pmem/TEST1
+++ b/src/test/pmem_is_pmem/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,10 +44,8 @@ require_fs_type pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 expect_normal_exit ./pmem_is_pmem$EXESUFFIX $DIR/testfile1
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/pmem_is_pmem/TEST2 b/src/test/pmem_is_pmem/TEST2
index 582e8196f..50b980446 100755
--- a/src/test/pmem_is_pmem/TEST2
+++ b/src/test/pmem_is_pmem/TEST2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,11 +44,9 @@ require_fs_type non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 export PMEM_IS_PMEM_FORCE=1
 expect_normal_exit ./pmem_is_pmem$EXESUFFIX $DIR/testfile1
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/pmem_is_pmem/TEST3 b/src/test/pmem_is_pmem/TEST3
index 98ce9434a..e1b4f8acb 100755
--- a/src/test/pmem_is_pmem/TEST3
+++ b/src/test/pmem_is_pmem/TEST3
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,11 +44,9 @@ require_fs_type pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 export PMEM_IS_PMEM_FORCE=0
 expect_normal_exit ./pmem_is_pmem$EXESUFFIX $DIR/testfile1
-rm $DIR/testfile1
 
 check
 
diff --git a/src/test/pmem_map/TEST0 b/src/test/pmem_map/TEST0
index 1a62b9475..da1455b99 100755
--- a/src/test/pmem_map/TEST0
+++ b/src/test/pmem_map/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,13 +44,10 @@ require_fs_type local
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 
 expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_map/TEST1 b/src/test/pmem_map/TEST1
index cd8c0eb38..8f5c10956 100755
--- a/src/test/pmem_map/TEST1
+++ b/src/test/pmem_map/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,14 +44,11 @@ require_fs_type local
 
 setup
 
-rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 # pass the file of zero length
 expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memcpy/TEST0 b/src/test/pmem_memcpy/TEST0
index bf146fa8f..7c8c178d6 100755
--- a/src/test/pmem_memcpy/TEST0
+++ b/src/test/pmem_memcpy/TEST0
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # aligned everything
 expect_normal_exit ./pmem_memcpy$EXESUFFIX $DIR/testfile1 0 0 4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memcpy/TEST1 b/src/test/pmem_memcpy/TEST1
index 6985f8ae7..939e8450a 100755
--- a/src/test/pmem_memcpy/TEST1
+++ b/src/test/pmem_memcpy/TEST1
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # unaligned dest
 expect_normal_exit ./pmem_memcpy$EXESUFFIX $DIR/testfile1 7 0 4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memcpy/TEST2 b/src/test/pmem_memcpy/TEST2
index 0a583b016..f27af5da8 100755
--- a/src/test/pmem_memcpy/TEST2
+++ b/src/test/pmem_memcpy/TEST2
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # unaligned dest, unaligned src
 expect_normal_exit ./pmem_memcpy$EXESUFFIX $DIR/testfile1 7 9 4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memcpy/TEST3 b/src/test/pmem_memcpy/TEST3
index 030517633..f6fe469c2 100755
--- a/src/test/pmem_memcpy/TEST3
+++ b/src/test/pmem_memcpy/TEST3
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # aligned dest, unaligned src
 expect_normal_exit ./pmem_memcpy$EXESUFFIX $DIR/testfile1 0 9 4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST0 b/src/test/pmem_memmove/TEST0
index 07854bc54..0f2de68c4 100755
--- a/src/test/pmem_memmove/TEST0
+++ b/src/test/pmem_memmove/TEST0
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # No offset, no overlap
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096
 
-#rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST1 b/src/test/pmem_memmove/TEST1
index 4fecd4d86..76a1815ff 100755
--- a/src/test/pmem_memmove/TEST1
+++ b/src/test/pmem_memmove/TEST1
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # aligned dest, unaligned source, no overlap
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 s:7 b:4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST10 b/src/test/pmem_memmove/TEST10
index 0952b9d4a..d440182b9 100755
--- a/src/test/pmem_memmove/TEST10
+++ b/src/test/pmem_memmove/TEST10
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # aligned dest, no overlap, small length
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:8
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST11 b/src/test/pmem_memmove/TEST11
index 661af6135..4721275c1 100755
--- a/src/test/pmem_memmove/TEST11
+++ b/src/test/pmem_memmove/TEST11
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # small length, offset 1 byte from 64 byte boundary
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4 d:63
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST12 b/src/test/pmem_memmove/TEST12
index 7c79cedb4..e2499307c 100755
--- a/src/test/pmem_memmove/TEST12
+++ b/src/test/pmem_memmove/TEST12
@@ -44,15 +44,12 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # overlap, src < dest, small length(ensures a copy backwards, with number of bytes to
 # align < length)
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 o:2 S:2 b:8
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST2 b/src/test/pmem_memmove/TEST2
index df3fdc7cd..997e764b0 100755
--- a/src/test/pmem_memmove/TEST2
+++ b/src/test/pmem_memmove/TEST2
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # unaligned dest, unaligned source, no overlap
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 d:7 s:13 b:4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST3 b/src/test/pmem_memmove/TEST3
index 08c723f47..fb19f9de7 100755
--- a/src/test/pmem_memmove/TEST3
+++ b/src/test/pmem_memmove/TEST3
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # all aligned, src overlaps dest
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 S:23 o:1
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST4 b/src/test/pmem_memmove/TEST4
index 6b0f1a6c7..6e556d3c1 100755
--- a/src/test/pmem_memmove/TEST4
+++ b/src/test/pmem_memmove/TEST4
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # unaligned destination
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 d:21
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST5 b/src/test/pmem_memmove/TEST5
index 9024f53d1..e33be55ad 100755
--- a/src/test/pmem_memmove/TEST5
+++ b/src/test/pmem_memmove/TEST5
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # unaligned source and dest
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 d:21 s:7
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST6 b/src/test/pmem_memmove/TEST6
index ef807a41e..faeaafec0 100755
--- a/src/test/pmem_memmove/TEST6
+++ b/src/test/pmem_memmove/TEST6
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # overlap of src, aligned src and dest
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 o:1 S:20
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST7 b/src/test/pmem_memmove/TEST7
index 313b96da4..13fcb2550 100755
--- a/src/test/pmem_memmove/TEST7
+++ b/src/test/pmem_memmove/TEST7
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # overlap of src, aligned src, unaligned dest
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 d:13 o:1 S:20
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST8 b/src/test/pmem_memmove/TEST8
index accf01002..a1e3c9b92 100755
--- a/src/test/pmem_memmove/TEST8
+++ b/src/test/pmem_memmove/TEST8
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # dest overlaps src, unaligned dest, aligned src
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:2048 d:13 o:2 S:20
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memmove/TEST9 b/src/test/pmem_memmove/TEST9
index 6678629ed..11054ed76 100755
--- a/src/test/pmem_memmove/TEST9
+++ b/src/test/pmem_memmove/TEST9
@@ -44,14 +44,11 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 # dest overlaps src, aligned dest and src
 expect_normal_exit ./pmem_memmove$EXESUFFIX $DIR/testfile1 b:4096 o:2 S:20
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memset/TEST0 b/src/test/pmem_memset/TEST0
index d1f4a80ec..424cb764e 100755
--- a/src/test/pmem_memset/TEST0
+++ b/src/test/pmem_memset/TEST0
@@ -44,13 +44,10 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 expect_normal_exit ./pmem_memset$EXESUFFIX $DIR/testfile1 0 8
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memset/TEST1 b/src/test/pmem_memset/TEST1
index 22de4d886..dd8b46cb1 100755
--- a/src/test/pmem_memset/TEST1
+++ b/src/test/pmem_memset/TEST1
@@ -44,13 +44,10 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 expect_normal_exit ./pmem_memset$EXESUFFIX $DIR/testfile1 13 4096
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_memset/TEST2 b/src/test/pmem_memset/TEST2
index 295ddba62..4cc6dc0d7 100755
--- a/src/test/pmem_memset/TEST2
+++ b/src/test/pmem_memset/TEST2
@@ -44,13 +44,10 @@ require_fs_type pmem non-pmem
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 expect_normal_exit ./pmem_memset$EXESUFFIX $DIR/testfile1 62 8
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmem_valgr_simple/TEST0 b/src/test/pmem_valgr_simple/TEST0
index 7a5e59d13..3d709d351 100755
--- a/src/test/pmem_valgr_simple/TEST0
+++ b/src/test/pmem_valgr_simple/TEST0
@@ -45,15 +45,12 @@ require_valgrind_pmemcheck
 
 setup
 
-rm -f $DIR/testfile1
 truncate -s 4MB $DIR/testfile1
 
 expect_normal_exit valgrind --log-file=valgrind$UNITTEST_NUM.log\
  --tool=pmemcheck --mult-stores=yes ./pmem_valgr_simple$EXESUFFIX\
   $DIR/testfile1 60 8
 
-rm $DIR/testfile1
-
 check
 
 pass
diff --git a/src/test/pmempool_check/TEST0 b/src/test/pmempool_check/TEST0
index 464c6a5d5..33eff4fd5 100755
--- a/src/test/pmempool_check/TEST0
+++ b/src/test/pmempool_check/TEST0
@@ -48,7 +48,6 @@ LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
 echo "PMEMLOG: pool_hdr" >> $LOG
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 check_file $POOL
 $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR >> $LOG
@@ -68,8 +67,6 @@ check_file $POOL
 $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR >> $LOG
 expect_normal_exit $PMEMPOOL check $POOL >> $LOG || true
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_check/TEST1 b/src/test/pmempool_check/TEST1
index 0fd912e27..5851c5648 100755
--- a/src/test/pmempool_check/TEST1
+++ b/src/test/pmempool_check/TEST1
@@ -48,7 +48,6 @@ LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
 echo "PMEMLOG: pool_hdr" >> $LOG
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 check_file $POOL
 $PMEMSPOIL -v $POOL pool_hdr.major=0x0\
@@ -86,8 +85,6 @@ $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR\
 			pmemblk.bsize=0 >> $LOG
 expect_normal_exit $PMEMPOOL check -vry $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_check/TEST2 b/src/test/pmempool_check/TEST2
index 56d386381..67dd3fd54 100755
--- a/src/test/pmempool_check/TEST2
+++ b/src/test/pmempool_check/TEST2
@@ -48,15 +48,10 @@ POOL_BACKUP=$DIR/file.pool.backup
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
-rm -rf $POOL_BACKUP
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 check_file $POOL
 $PMEMSPOIL $POOL pool_hdr.signature=ERROR
 expect_normal_exit $PMEMPOOL check -b $POOL_BACKUP -r $POOL >/dev/null || true
 check_file ${POOL_BACKUP}
 
-rm -f $POOL
-rm -f $POOL_BACKUP
-
 pass
diff --git a/src/test/pmempool_check/TEST3 b/src/test/pmempool_check/TEST3
index ef8336ff0..d96c2347c 100755
--- a/src/test/pmempool_check/TEST3
+++ b/src/test/pmempool_check/TEST3
@@ -47,15 +47,12 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 check_file $POOL
 $PMEMSPOIL $POOL pool_hdr.signature=ERROR "arena.btt_map(0)=0xc0000001" "arena.btt_flog(0).seq=5"
 
 expect_normal_exit $PMEMPOOL check -vry $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_check/TEST4 b/src/test/pmempool_check/TEST4
index 5feecfbc5..63e1eee75 100755
--- a/src/test/pmempool_check/TEST4
+++ b/src/test/pmempool_check/TEST4
@@ -47,15 +47,12 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 check_file $POOL
 $PMEMSPOIL -v $POOL pool_hdr.checksum=0x0 >> $LOG
 
 expect_normal_exit $PMEMPOOL check -vry $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_check/TEST5 b/src/test/pmempool_check/TEST5
index 37711248a..54a97e27d 100755
--- a/src/test/pmempool_check/TEST5
+++ b/src/test/pmempool_check/TEST5
@@ -48,16 +48,12 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
-
 truncate -s2T $POOL
 expect_normal_exit $PMEMPOOL create -v -l blk 512M $POOL >> $LOG
 check_file $POOL
 $PMEMSPOIL $POOL pool_hdr.checksum=0x0 "arena(1).btt_info.sig=ERROR" "arena(1).btt_info_backup.sig=ERROR"
 expect_normal_exit $PMEMPOOL check -vry $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_create/TEST0 b/src/test/pmempool_create/TEST0
index e71e824bd..d1f2b1708 100755
--- a/src/test/pmempool_create/TEST0
+++ b/src/test/pmempool_create/TEST0
@@ -46,7 +46,6 @@ setup
 POOL=$DIR/file.pool
 
 # PMEMBLK
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 check_file $POOL
 check_signature PMEMBLK $POOL
@@ -64,6 +63,4 @@ check_file $POOL
 check_signature OBJPOOL $POOL
 check_layout LAYOUT_NAME $POOL
 
-rm -f $POOL
-
 pass
diff --git a/src/test/pmempool_create/TEST1 b/src/test/pmempool_create/TEST1
index 00488551f..4d92d7380 100755
--- a/src/test/pmempool_create/TEST1
+++ b/src/test/pmempool_create/TEST1
@@ -46,7 +46,6 @@ setup
 POOL=$DIR/file.pool
 
 # PMEMBLK with layout
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 check_file $POOL
 check_signature PMEMBLK $POOL
@@ -59,6 +58,4 @@ check_file $POOL
 check_signature PMEMBLK $POOL
 check_arena $POOL
 
-rm -f $POOL
-
 pass
diff --git a/src/test/pmempool_create/TEST2 b/src/test/pmempool_create/TEST2
index d2bf39ce3..8dbbd0f85 100755
--- a/src/test/pmempool_create/TEST2
+++ b/src/test/pmempool_create/TEST2
@@ -47,7 +47,6 @@ POOL=$DIR/file.pool
 SIZE=$(((1024 + 512) * 1024 * 1024))
 
 # PMEMBLK
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -s $SIZE blk 512 $POOL
 check_file $POOL
 check_signature PMEMBLK $POOL
@@ -68,6 +67,4 @@ check_signature OBJPOOL $POOL
 check_layout "" $POOL
 check_size $SIZE $POOL
 
-rm -f $POOL
-
 pass
diff --git a/src/test/pmempool_create/TEST3 b/src/test/pmempool_create/TEST3
index 770d12e45..988285d7e 100755
--- a/src/test/pmempool_create/TEST3
+++ b/src/test/pmempool_create/TEST3
@@ -47,8 +47,6 @@ POOL=$DIR/file.pool
 INHERIT=$DIR/inherit.pool
 
 # PMEMBLK
-rm -rf $POOL
-rm -rf $INHERIT
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 check_file $POOL
 check_signature PMEMBLK $POOL
@@ -84,7 +82,4 @@ check_signature OBJPOOL $INHERIT
 check_layout LAYOUT_NAME $POOL
 check_size $SIZE $INHERIT
 
-rm -f $POOL
-rm -f $INHERIT
-
 pass
diff --git a/src/test/pmempool_create/TEST4 b/src/test/pmempool_create/TEST4
index 54f35d114..299e91ea3 100755
--- a/src/test/pmempool_create/TEST4
+++ b/src/test/pmempool_create/TEST4
@@ -46,7 +46,6 @@ setup
 POOL=$DIR/file.pool
 
 # PMEMBLK
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -m 0666 blk 512 $POOL
 check_file $POOL
 check_signature PMEMBLK $POOL
@@ -67,6 +66,4 @@ check_signature OBJPOOL $POOL
 check_layout LAYOUT_NAME $POOL
 check_mode 556 $POOL
 
-rm -f $POOL
-
 pass
diff --git a/src/test/pmempool_create/TEST5 b/src/test/pmempool_create/TEST5
index 656a997fb..e91cd0f81 100755
--- a/src/test/pmempool_create/TEST5
+++ b/src/test/pmempool_create/TEST5
@@ -46,11 +46,8 @@ setup
 POOL=$DIR/file.pool
 
 # PMEMBLK
-rm -rf $POOL
 expect_abnormal_exit $PMEMPOOL create blk $POOL 2> err5.log
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_dump/TEST0 b/src/test/pmempool_dump/TEST0
index ddf0bb586..e1560ec2c 100755
--- a/src/test/pmempool_dump/TEST0
+++ b/src/test/pmempool_dump/TEST0
@@ -47,7 +47,6 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST
 expect_normal_exit $PMEMPOOL dump -b -o $LOG $POOL
@@ -55,8 +54,6 @@ echo >> $LOG
 expect_normal_exit $PMEMPOOL dump -b $POOL >> $LOG
 echo >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_dump/TEST1 b/src/test/pmempool_dump/TEST1
index 0d1193a4a..7260ca9a2 100755
--- a/src/test/pmempool_dump/TEST1
+++ b/src/test/pmempool_dump/TEST1
@@ -47,14 +47,11 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST
 expect_normal_exit $PMEMPOOL dump -o $LOG $POOL
 expect_normal_exit $PMEMPOOL dump $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_dump/TEST2 b/src/test/pmempool_dump/TEST2
index 32e1a04c1..491848614 100755
--- a/src/test/pmempool_dump/TEST2
+++ b/src/test/pmempool_dump/TEST2
@@ -47,14 +47,11 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST_test
 expect_normal_exit $PMEMPOOL dump -r5,6,7,8 -o $LOG $POOL
 expect_normal_exit $PMEMPOOL dump -r5-8 $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_dump/TEST3 b/src/test/pmempool_dump/TEST3
index b41a7b44f..23354dd80 100755
--- a/src/test/pmempool_dump/TEST3
+++ b/src/test/pmempool_dump/TEST3
@@ -47,15 +47,12 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 expect_normal_exit $PMEMWRITE $POOL 0:w:TEST0
 expect_normal_exit $PMEMPOOL dump -r-1 -o dump.log $POOL
 cat dump.log | grep "^00000000" >> $LOG
 expect_normal_exit $PMEMPOOL dump -r0 $POOL | grep "^00000000" >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_dump/TEST4 b/src/test/pmempool_dump/TEST4
index 53d7d16d5..76fd87b4d 100755
--- a/src/test/pmempool_dump/TEST4
+++ b/src/test/pmempool_dump/TEST4
@@ -47,14 +47,11 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST1TEST2TEST3TEST4
 expect_normal_exit $PMEMPOOL dump -c5 -o $LOG $POOL
 expect_normal_exit $PMEMPOOL dump -c5 $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST0 b/src/test/pmempool_info/TEST0
index ede71f24e..21c755b0f 100755
--- a/src/test/pmempool_info/TEST0
+++ b/src/test/pmempool_info/TEST0
@@ -47,12 +47,9 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 expect_normal_exit $PMEMPOOL info $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST1 b/src/test/pmempool_info/TEST1
index 9646ec657..64b8813bd 100755
--- a/src/test/pmempool_info/TEST1
+++ b/src/test/pmempool_info/TEST1
@@ -47,12 +47,9 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMPOOL info $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST2 b/src/test/pmempool_info/TEST2
index 4969af1cc..b8a110142 100755
--- a/src/test/pmempool_info/TEST2
+++ b/src/test/pmempool_info/TEST2
@@ -47,12 +47,9 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 expect_normal_exit $PMEMPOOL info $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST3 b/src/test/pmempool_info/TEST3
index f0dd3658d..e174524b5 100755
--- a/src/test/pmempool_info/TEST3
+++ b/src/test/pmempool_info/TEST3
@@ -47,12 +47,9 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 expect_normal_exit $PMEMPOOL info -B $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST4 b/src/test/pmempool_info/TEST4
index 05ea6985a..b4f90331b 100755
--- a/src/test/pmempool_info/TEST4
+++ b/src/test/pmempool_info/TEST4
@@ -47,7 +47,6 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 expect_normal_exit $PMEMPOOL info -s $POOL >> $LOG
 
@@ -57,8 +56,6 @@ rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMPOOL info -s $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST5 b/src/test/pmempool_info/TEST5
index a18d5a3bd..abbfdd6bd 100755
--- a/src/test/pmempool_info/TEST5
+++ b/src/test/pmempool_info/TEST5
@@ -47,7 +47,6 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMPOOL info -x $POOL >> $LOG
 
@@ -57,8 +56,6 @@ rm -rf $POOL
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 expect_normal_exit $PMEMPOOL info -x $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST6 b/src/test/pmempool_info/TEST6
index 36a8bdebc..57252b695 100755
--- a/src/test/pmempool_info/TEST6
+++ b/src/test/pmempool_info/TEST6
@@ -47,13 +47,10 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST
 expect_normal_exit $PMEMPOOL info -d $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST7 b/src/test/pmempool_info/TEST7
index ce038545c..41c10c417 100755
--- a/src/test/pmempool_info/TEST7
+++ b/src/test/pmempool_info/TEST7
@@ -47,13 +47,10 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create log $POOL
 expect_normal_exit $PMEMWRITE $POOL TEST
 expect_normal_exit $PMEMPOOL info -d $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST8 b/src/test/pmempool_info/TEST8
index fc37bf2bc..d15d2140a 100755
--- a/src/test/pmempool_info/TEST8
+++ b/src/test/pmempool_info/TEST8
@@ -47,7 +47,6 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create blk 512 $POOL
 expect_normal_exit $PMEMWRITE $POOL 1:e 2:w:TEST
 
@@ -69,8 +68,6 @@ NSUM=$(($NZER + $NERR + $NNON))
 
 expect_normal_exit $PMEMPOOL info -dz $POOL >> $LOG
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/pmempool_info/TEST9 b/src/test/pmempool_info/TEST9
index e8f3028fc..62039a36d 100755
--- a/src/test/pmempool_info/TEST9
+++ b/src/test/pmempool_info/TEST9
@@ -47,15 +47,12 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
-rm -rf $POOL
 expect_normal_exit $PMEMPOOL create -w blk 512 $POOL
 INFO_NFLOG=$(expect_normal_exit $PMEMPOOL info $POOL | grep 'Free blocks' | grep -o '[0-9]\+')
 NFLOG=$(expect_normal_exit $PMEMPOOL info -g $POOL | grep -o '^[0-9]\+:' | wc -l)
 
 [[ $INFO_NFLOG == $NFLOG ]] || exit 1
 
-rm -f $POOL
-
 check
 
 pass
diff --git a/src/test/util_pool_create/TEST0 b/src/test/util_pool_create/TEST0
index c5745e0f6..576cfb009 100755
--- a/src/test/util_pool_create/TEST0
+++ b/src/test/util_pool_create/TEST0
@@ -46,13 +46,6 @@ setup
 
 MIN_POOL=0x4000
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testfile3
-rm -f $DIR/testlink1
-rm -f $DIR/testlink2
-rm -f $DIR/testlink3
-rm -f $DIR/testlink4
 rm -fr $DIR/testdir1
 
 truncate -s 32K $DIR/testfile1
@@ -73,8 +66,6 @@ expect_normal_exit ./util_pool_create$EXESUFFIX $MIN_POOL \
     0x1000:$DIR/testfile2\
     $MIN_POOL:$DIR/testfile3
 
-rm -f $DIR/testfile[123]
-rm -f $DIR/testlink[1234]
 rm -fr $DIR/testdir1
 
 check
diff --git a/src/test/util_pool_create/TEST1 b/src/test/util_pool_create/TEST1
index d8b00e18f..766ac2c0f 100755
--- a/src/test/util_pool_create/TEST1
+++ b/src/test/util_pool_create/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/src/test/util_pool_open/TEST0 b/src/test/util_pool_open/TEST0
index fd8dfaa47..5e4218c2a 100755
--- a/src/test/util_pool_open/TEST0
+++ b/src/test/util_pool_open/TEST0
@@ -46,11 +46,6 @@ setup
 
 MIN_POOL=0x4000
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testlink0
-rm -f $DIR/testlink1
-rm -f $DIR/testlink2
 rm -fr $DIR/testdir1
 
 truncate -s 1K $DIR/testfile1
@@ -70,8 +65,6 @@ expect_normal_exit ./util_pool_open$EXESUFFIX $MIN_POOL \
     $DIR/testfile1\
     $DIR/testfile2
 
-rm -f $DIR/testfile[12]
-rm -f $DIR/testlink[012]
 rm -fr $DIR/testdir1
 
 check
diff --git a/src/test/util_pool_open/TEST1 b/src/test/util_pool_open/TEST1
index c24f7e1f6..3a2473b19 100755
--- a/src/test/util_pool_open/TEST1
+++ b/src/test/util_pool_open/TEST1
@@ -47,11 +47,6 @@ setup
 
 MIN_POOL=0x4000
 
-rm -f $DIR/testfile1
-rm -f $DIR/testfile2
-rm -f $DIR/testlink1
-rm -f $DIR/testlink2
-
 truncate -s 32K $DIR/testfile1
 chmod -rw $DIR/testfile1
 truncate -s 32K $DIR/testfile2
@@ -65,9 +60,6 @@ expect_normal_exit ./util_pool_open$EXESUFFIX $MIN_POOL \
     $DIR/testfile1\
     $DIR/testfile2\
 
-rm -f $DIR/testfile[12]
-rm -f $DIR/testlink[12]
-
 check
 
 pass
-- 
GitLab