diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 129e487a8439cd8e5d48c54890a5600711e4bd8a..8e94aadc668723b6f2f9b1f5abeb6258796a9b56 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -392,7 +392,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
         extraInt0, extraInt1, extraInt2, extraInt3);
     QString expected(expected0);
     char buf[100];
-    sprintf(buf, pointerPrintFormat(), (uintptr_t)data);
+    sprintf(buf, pointerPrintFormat(), (quintptr)data);
     if ((!expected.startsWith('t') && !expected.startsWith('f'))
             || expected.startsWith("type"))
         expected = "tiname='$I',addr='$A'," + expected;
@@ -422,7 +422,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
 QByteArray str(const void *p)
 {
     char buf[100];
-    sprintf(buf, pointerPrintFormat(), (uintptr_t)p);
+    sprintf(buf, pointerPrintFormat(), (quintptr)p);
     return buf;
 }
 
@@ -1552,6 +1552,7 @@ template <typename K, typename V>
 
 void tst_Debugger::dumpQMap()
 {
+    qDebug() << "QMap<int, int>";
     // Case 1: Simple type -> simple type.
     QMap<int, int> map1;
 
@@ -1567,6 +1568,7 @@ void tst_Debugger::dumpQMap()
     dumpQMapHelper(map1);
 
     // Case 2: Simple type -> composite type.
+    qDebug() << "QMap<int, QString>";
     QMap<int, QString> map2;
 
     // Case 2.1: Empty Map.
@@ -1581,6 +1583,7 @@ void tst_Debugger::dumpQMap()
     dumpQMapHelper(map2);
 
     // Case 3: Composite type -> simple type.
+    qDebug() << "QMap<QString, int>";
     QMap<QString, int> map3;
 
     // Case 3.1: Empty map.
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index b6a4e2ab74874e60d1d141a93328137aaeb5d87e..79b66523761ca60cf9e91b2b354bcdce63b832af 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -3,11 +3,12 @@
 bool checkUninitialized = false;
 //#define DO_DEBUG 1
 
+#include "gdb/gdbmi.h"
+
 #include <QtCore/QThread>
 #include <QtCore/QMutex>
 #include <QtCore/QWaitCondition>
 
-
 /*
 #include <QtGui/QBitmap>
 #include <QtGui/QBrush>
@@ -23,8 +24,9 @@ bool checkUninitialized = false;
 
 #include <QtTest/QtTest>
 
-#include "gdb/gdbmi.h"
-
+#ifdef Q_OS_WIN
+#    include <windows.h>
+#endif
 
 #undef NS
 #ifdef QT_NAMESPACE
@@ -593,6 +595,9 @@ tst_Gdb::tst_Gdb()
 
 void tst_Gdb::initTestCase()
 {
+#ifndef Q_CC_GNU
+    QSKIP("gdb test not applicable for compiler", SkipAll);
+#endif   
     //qDebug() << "\nTHREAD RUN" << getpid() << gettid();
     QProcess *gdbProc = new QProcess;
     QStringList args;