Index: uspace/app/tester/hw/misc/virtchar1.c
===================================================================
--- uspace/app/tester/hw/misc/virtchar1.c	(revision 0bff73aed85c65c908499a83db3b7a8e89c7b3fc)
+++ uspace/app/tester/hw/misc/virtchar1.c	(revision eff1f033c237dd4f18d79cf25fbd33de6fa9278c)
@@ -48,32 +48,33 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64
 
-const char *test_virtchar1(void)
+static const char *test_virtchar1_internal(const char *path)
 {
-	TPRINTF("Opening %s...\n", DEVICE_PATH);
-	int fd = open(DEVICE_PATH, O_RDONLY);
+	TPRINTF("Opening `%s'...\n", path);
+	int fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		TPRINTF(" ...error: %s\n", str_error(fd));
+		TPRINTF("   ...error: %s\n", str_error(fd));
 		if (fd == ENOENT) {
-			TPRINTF(" (error was ENOENT: " \
+			TPRINTF("   (error was ENOENT: " \
 			    "have you compiled test drivers?)\n");
 		}
-		return "Failed opening " DEVICE_PATH " for reading";
+		return "Failed opening devman driver device for reading";
 	}
 	
-	TPRINTF(" ...file handle %d\n", fd);
+	TPRINTF("   ...file handle %d\n", fd);
 
-	TPRINTF("Asking for phone...\n");
+	TPRINTF(" Asking for phone...\n");
 	int phone = fd_phone(fd);
 	if (phone < 0) {
 		close(fd);
-		TPRINTF(" ...error: %s\n", str_error(phone));
+		TPRINTF("   ...error: %s\n", str_error(phone));
 		return "Failed to get phone to device";
 	}
-	TPRINTF(" ...phone is %d\n", phone);
+	TPRINTF("   ...phone is %d\n", phone);
 	
-	TPRINTF("Will try to read...\n");
+	TPRINTF(" Will try to read...\n");
 	size_t i;
 	char buffer[BUFFER_SIZE];
@@ -85,8 +86,8 @@
 		}
 	}
-	TPRINTF(" ...data read okay\n");
+	TPRINTF("   ...data read okay\n");
 	
 	/* Clean-up. */
-	TPRINTF("Closing phones and file descriptors");
+	TPRINTF(" Closing phones and file descriptors\n");
 	ipc_hangup(phone);
 	close(fd);
@@ -95,4 +96,21 @@
 }
 
+const char *test_virtchar1(void)
+{;
+	const char *res;
+
+	res = test_virtchar1_internal(DEVICE_PATH_NORMAL);
+	if (res != NULL) {
+		return res;
+	}
+
+	res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
+	if (res != NULL) {
+		return res;
+	}
+
+	return NULL;
+}
+
 /** @}
  */