diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f5d0228daf..a53f3354fb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-04 19:16 UTC+0600 April White (april users.sourceforge.net)
+  * contrib/hbbtree/test.prg
+    + erase all target files
+
 2009-07-04 19:16 UTC+0600 April White (april users.sourceforge.net)
   * contrib/hbbtree/ctest.c
     * remove ( BYTE * ) casts
diff --git a/harbour/contrib/hbbtree/tests/test.prg b/harbour/contrib/hbbtree/tests/test.prg
index 59b412d899..693210708d 100644
--- a/harbour/contrib/hbbtree/tests/test.prg
+++ b/harbour/contrib/hbbtree/tests/test.prg
@@ -42,11 +42,14 @@ Procedure Main()
   local c
   local attr
 
-  hb_FGetAttr( "test_1.out", @attr )
-  if attr == 1 + 32
-    hb_FSetAttr( "test_1.out", 32 )
-    ferase( "test_1.out" )
-  endif
+  // _2 is from ttest.prg; _3 is from ctest.c
+  FOR EACH c IN { "test_1.out", "test_1a.out", "test_1b.out", "test_2.out", "test_3.out" }
+    hb_FGetAttr( c, @attr )
+    if attr == 1 + 32
+      hb_FSetAttr( c, 32 )
+    endif
+    ferase( c )
+  NEXT
 
   ? "Harbour API test: in-memory"
   n := hb_btreenew( , 2048, 90, HB_BTREE_READONLY + HB_BTREE_INMEMORY )