diff --git a/dlls/kernel/tests/.gitignore b/dlls/kernel/tests/.gitignore
index e65a852d829..9546859af42 100644
--- a/dlls/kernel/tests/.gitignore
+++ b/dlls/kernel/tests/.gitignore
@@ -25,3 +25,4 @@ thread.ok
 time.ok
 timer.ok
 virtual.ok
+volume.ok
diff --git a/dlls/kernel/tests/Makefile.in b/dlls/kernel/tests/Makefile.in
index 6968d3c9197..95430475291 100644
--- a/dlls/kernel/tests/Makefile.in
+++ b/dlls/kernel/tests/Makefile.in
@@ -30,7 +30,8 @@ CTESTS = \
 	thread.c \
 	time.c \
 	timer.c \
-	virtual.c
+	virtual.c \
+	volume.c
 
 @MAKE_TEST_RULES@
 
diff --git a/dlls/kernel/tests/volume.c b/dlls/kernel/tests/volume.c
new file mode 100644
index 00000000000..98972dd1a83
--- /dev/null
+++ b/dlls/kernel/tests/volume.c
@@ -0,0 +1,51 @@
+/*
+ * Unit test suite
+ *
+ * Copyright 2006 Stefan Leichter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wine/test.h"
+#include "winbase.h"
+
+#define CDROM   "CDROM"
+#define FLOPPY  "FLOPPY"
+#define HARDISK "HARDDISK"
+#define LANMAN  "LANMANREDIRECTOR"
+#define RAMDISK "RAMDISK"
+
+static void test_query_dos_deviceA(void)
+{
+    char drivestr[] = "a:";
+    char *p, buffer[2000];
+    DWORD ret;
+    for (;drivestr[0] <= 'z'; drivestr[0]++) {
+        ret = QueryDosDeviceA( drivestr, buffer, sizeof(buffer));
+        if(ret) {
+            for (p = buffer; *p; p++) *p = toupper(*p);
+            todo_wine
+            ok( strstr( buffer, CDROM)   || strstr( buffer, FLOPPY) ||
+                strstr( buffer, HARDISK) || strstr( buffer, LANMAN) ||
+                strstr( buffer, RAMDISK), "expect the string %s contains %s,%s,%s,%s or %s\n",
+                buffer, CDROM, FLOPPY, HARDISK, LANMAN, RAMDISK);
+        }
+    }
+}
+
+START_TEST(volume)
+{
+    test_query_dos_deviceA();
+}