diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f7520ce056..d50ce0d856 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+Wed Nov 03 18:38:03 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* tests/testbrdb.prg: 
+	The test now restores the color setting and does a CLS before
+	exiting.
+	
+	* tests/testbrw.prg: 
+	The test now remembers its device position, cursor setting and
+	color and restores everything before exiting.
+
 19991103-07:28 GMT+1 Antonio Linares
    * source/rtl/classes.c
      * hb___msgSuper() simplied, faster and less memory consume.
diff --git a/harbour/tests/testbrdb.prg b/harbour/tests/testbrdb.prg
index c49e2b1331..1e2247b303 100644
--- a/harbour/tests/testbrdb.prg
+++ b/harbour/tests/testbrdb.prg
@@ -5,11 +5,15 @@
 // Testing Browse()
 
 function Main()
+   LOCAL cColor
 
-   SET COLOR TO "W+/B"
+   cColor := SETCOLOR("W+/B")
    CLS
 
    USE Test
    Browse()
 
+   SETCOLOR(cColor)
+   CLS
+
 return nil
diff --git a/harbour/tests/testbrw.prg b/harbour/tests/testbrw.prg
index 0e7246baaf..30c148123f 100644
--- a/harbour/tests/testbrw.prg
+++ b/harbour/tests/testbrw.prg
@@ -13,6 +13,9 @@ function Main()
    local n       := 1
    local nKey
    local lEnd    := .f.
+   local nCursor
+   local cColor
+   local nRow, nCol
 
    oBrowse:colorSpec     = "W+/B, N/BG"
    oBrowse:ColSep        = "³"
@@ -39,9 +42,10 @@ function Main()
    Alert( oBrowse:GetColumn( 1 ):ClassName() )
 
    oBrowse:Freeze = 1
-   SetCursor( 0 )
-
-   set color to "W+/B"
+   nCursor := SetCursor( 0 )
+   cColor := SetColor( "W+/B" )
+   nRow := Row()
+   nCol := Col()
    @ 4,4,17,31 BOX "ÚÄ¿³ÙÄÀ³ "
 
    while ! lEnd
@@ -100,4 +104,8 @@ function Main()
       endcase
    end
 
+   DevPos( nRow, nCol )
+   SetColor( cColor )
+   SetCursor( nCursor )
+
 return nil