diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 58e12a9240..1a091a122e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+19991117-01:37 GMT+1 Victor Szel <info@szelvesz.hu>
+  * config/w32/mingw32.cf
+    - Removed -DDEBUG preprocessor option.
+      If you want to compile with debug, add -DDEBUG to the
+      C_USR environment variable.
+  * tests/rtl_test.prg
+    + Some tests enabled which are now supported by the compiler.
+      (expr):CLASSNAME, (expr):CLASSH
+
 19991116-19:25 EDT David G. Holm <dholm@jsd-llc.com>
 
     * config/dos/djgpp.cf
diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf
index 0bcd86fb78..ef7c7ccd35 100644
--- a/harbour/config/w32/mingw32.cf
+++ b/harbour/config/w32/mingw32.cf
@@ -12,7 +12,7 @@ LIB_EXT = .a
 CC = gcc
 CC_IN = -c
 CC_OUT = -o
-CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE) -mno-cygwin
+CPPFLAGS = -I. -I$(HB_INC_COMPILE) -mno-cygwin
 CFLAGS = -Wall
 
 LD = gcc
diff --git a/harbour/tests/rtl_test.prg b/harbour/tests/rtl_test.prg
index 91c950cee8..fba9753a8e 100644
--- a/harbour/tests/rtl_test.prg
+++ b/harbour/tests/rtl_test.prg
@@ -264,6 +264,7 @@ STATIC FUNCTION Main_HVM()
 /* Harbour compiler not yet handles these */
 #ifndef __HARBOUR__
    TEST_LINE( NIL:className                   , "NIL"       )
+#endif                                                      )
    TEST_LINE( "":className                    , "CHARACTER" )
    TEST_LINE( 0:className                     , "NUMERIC"   )
    TEST_LINE( SToD( "" ):className            , "DATE"      )
@@ -271,7 +272,10 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( {|| nil }:className             , "BLOCK"     )
    TEST_LINE( {}:className                    , "ARRAY"     )
    TEST_LINE( ErrorNew():className            , "ERROR"     )
+/* Harbour compiler not yet handles these */
+#ifndef __HARBOUR__
    TEST_LINE( NIL:classH                      , 0           )
+#endif
    TEST_LINE( "":classH                       , 0           )
    TEST_LINE( 0:classH                        , 0           )
    TEST_LINE( SToD( "" ):classH               , 0           )
@@ -279,7 +283,6 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( {|| nil }:classH                , 0           )
    TEST_LINE( {}:classH                       , 0           )
    TEST_LINE( ErrorNew():classH > 0           , .T.         )
-#endif                                                      )
 
 /* Harbour compiler not yet handles these */
 #ifndef __HARBOUR__