diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 8d8c3573b917f5cf3bc0fccbb17048f1d0dd46cb..dd65c97cba6f6989ca4bfcdc889bcedebf896c08 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -157,6 +157,7 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
 			break ;
 		case REQUEST_LAUNCH_TASKS :
 			pack_launch_tasks_request_msg ( ( launch_tasks_request_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ;
+			break ;
 		case RESPONSE_LAUNCH_TASKS :
 			pack_launch_tasks_response_msg ( ( launch_tasks_response_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ;
 			break ;
@@ -291,6 +292,7 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
 		case REQUEST_LAUNCH_TASKS :
 			unpack_launch_tasks_request_msg ( ( launch_tasks_request_msg_t ** ) & ( msg->data ) , 
 				( void ** ) buffer , buf_len ) ;
+			break ;
 		case RESPONSE_LAUNCH_TASKS :
 			unpack_launch_tasks_response_msg ( ( launch_tasks_response_msg_t ** ) & ( msg->data ) , 
 				( void ** ) buffer , buf_len ) ;
diff --git a/testsuite/slurm_unit/slurmd/srun_emu.pl b/testsuite/slurm_unit/slurmd/srun_emu.pl
index f6d56f05c3d97ad11fe4bd25f5d4065a00ff302b..c5067e42284ed0f716e66a2ec9307c52f4392370 100755
--- a/testsuite/slurm_unit/slurmd/srun_emu.pl
+++ b/testsuite/slurm_unit/slurmd/srun_emu.pl
@@ -1,41 +1,24 @@
 #!/usr/bin/perl
 use IO::Socket;
-
-$pid = fork();
-if ($pid)
+my $sock1 = new IO::Socket::INET (
+		LocalHost => 'localhost',
+		LocalPort => '7071',
+		Proto => 'tcp',
+		Listen => 1,
+		Reuse => 1,
+		);
+while ( true )
 {
-#stdout
-	my $sock1 = new IO::Socket::INET (
-			LocalHost => 'localhost',
-			LocalPort => '7071',
-			Proto => 'tcp',
-			Listen => 1,
-			Reuse => 1,
-			);
 	my $new_sock1 = $sock1->accept();
-	while(<$new_sock1>) 
+	$pid = fork ();
+	if ($pid)
 	{
-		print STDOUT $_;
-	}
-	close($sock1);
-	print "CLOSED STD OUT SOCKET" ;
 
-}
-else
-{
-#stderr
-	my $sock2 = new IO::Socket::INET (
-			LocalHost => 'localhost',
-			LocalPort => '7072',
-			Proto => 'tcp',
-			Listen => 1,
-			Reuse => 1,
-			);
-	my $new_sock2 = $sock2->accept();
-	while(<$new_sock2>) 
-	{
-		print STDERR $_;
+		while(<$new_sock1>) 
+		{
+			print STDOUT $_;
+		}
+		close($sock1);
+		print "CLOSED STD OUT SOCKET" ;
 	}
-	close($sock2);
-	print "CLOSED STD ERR SOCKET" ;
 }
diff --git a/testsuite/slurm_unit/slurmd/task_launch-test.c b/testsuite/slurm_unit/slurmd/task_launch-test.c
index 67a79035c62116ee91c129359153bd053ff6725d..bf22a83300b0ab8b08c2206a285768c82ab3b550 100644
--- a/testsuite/slurm_unit/slurmd/task_launch-test.c
+++ b/testsuite/slurm_unit/slurmd/task_launch-test.c
@@ -16,7 +16,7 @@ int main ( int argc , char* argv[] )
 	gids[1] = 9999 ;
 	
 	credential . node_list = "TESTING" ;
-	slurm_set_addr_char ( & slurmd_addr , 7002 , "localhost" ) ;
+	slurm_set_addr_char ( & slurmd_addr , 7003 , "localhost" ) ;
 
 	request_msg . msg_type = REQUEST_LAUNCH_TASKS ;
 	request_msg . data = & launch_tasks_msg ;