Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision bbc6277ad36dbd4db13407f458067acf6bb14623)
@@ -27,8 +27,8 @@
  */
 
+#include <async.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <thread.h>
 #include "config.h"
 #include "util.h"
@@ -131,5 +131,5 @@
 	}
 
-	(void) thread_usleep(duration);
+	async_usleep(duration);
 
 	return CMD_SUCCESS;
Index: uspace/app/tester/hw/serial/serial1.c
===================================================================
--- uspace/app/tester/hw/serial/serial1.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/app/tester/hw/serial/serial1.c	(revision bbc6277ad36dbd4db13407f458067acf6bb14623)
@@ -45,5 +45,4 @@
 #include <stddef.h>
 #include <str.h>
-#include <thread.h>
 #include "../../tester.h"
 
@@ -162,38 +161,34 @@
 		TPRINTF("Read %zd bytes\n", nread);
 		
-		if (nread == 0)
-			thread_usleep(DEFAULT_SLEEP);
-		else {
-			buf[nread] = 0;
-			
-			/*
-			 * Write data back to the device to test the opposite
-			 * direction of data transfer.
-			 */
-			rc = chardev_write(chardev, buf, nread, &nwritten);
-			if (rc != EOK) {
-				(void) serial_set_comm_props(serial, old_baud,
-				    old_par, old_word_size, old_stop);
-				
-				free(buf);
-				chardev_close(chardev);
-				serial_close(serial);
-				async_hangup(sess);
-				return "Failed writing to serial device";
-			}
-			
-			if (nwritten != nread) {
-				(void) serial_set_comm_props(serial, old_baud,
-				    old_par, old_word_size, old_stop);
-				
-				free(buf);
-				chardev_close(chardev);
-				serial_close(serial);
-				async_hangup(sess);
-				return "Written less data than read from serial device";
-			}
-			
-			TPRINTF("Written %zd bytes\n", nwritten);
-		}
+		buf[nread] = 0;
+		
+		/*
+		 * Write data back to the device to test the opposite
+		 * direction of data transfer.
+		 */
+		rc = chardev_write(chardev, buf, nread, &nwritten);
+		if (rc != EOK) {
+			(void) serial_set_comm_props(serial, old_baud,
+			    old_par, old_word_size, old_stop);
+			
+			free(buf);
+			chardev_close(chardev);
+			serial_close(serial);
+			async_hangup(sess);
+			return "Failed writing to serial device";
+		}
+		
+		if (nwritten != nread) {
+			(void) serial_set_comm_props(serial, old_baud,
+			    old_par, old_word_size, old_stop);
+			
+			free(buf);
+			chardev_close(chardev);
+			serial_close(serial);
+			async_hangup(sess);
+			return "Written less data than read from serial device";
+		}
+		
+		TPRINTF("Written %zd bytes\n", nwritten);
 		
 		total += nread;