diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index 1ad61d278..543b5151d 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -28,7 +28,7 @@ mkdir -p /usr/local/etc
 cp $testdir/its.conf /usr/local/etc/
 cp $testdir/auth.conf /usr/local/etc/
 
-$ISCSI_APP -c $testdir/iscsi.conf &
+$ISCSI_APP -c $testdir/iscsi.conf -m 0x1 &
 pid=$!
 echo "Process pid: $pid"
 
diff --git a/test/iscsi_tgt/calsoft/iscsi.conf b/test/iscsi_tgt/calsoft/iscsi.conf
index 994696232..a63fefb8f 100644
--- a/test/iscsi_tgt/calsoft/iscsi.conf
+++ b/test/iscsi_tgt/calsoft/iscsi.conf
@@ -1,5 +1,4 @@
 [Global]
-  ReactorMask 0x1
   LogFacility "local7"
 
 [iSCSI]
diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index d3821b9cb..2550d657d 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -18,7 +18,7 @@ MALLOC_BLOCK_SIZE=512
 
 rpc_py="python $rootdir/scripts/rpc.py"
 
-$ISCSI_APP -c $testdir/iscsi.conf &
+$ISCSI_APP -c $testdir/iscsi.conf -m 0xFFFF &
 pid=$!
 echo "Process pid: $pid"
 
diff --git a/test/iscsi_tgt/filesystem/iscsi.conf b/test/iscsi_tgt/filesystem/iscsi.conf
index 0c90807d7..bcc80a845 100644
--- a/test/iscsi_tgt/filesystem/iscsi.conf
+++ b/test/iscsi_tgt/filesystem/iscsi.conf
@@ -1,5 +1,4 @@
 [Global]
-  ReactorMask 0xFFFF
   LogFacility "local7"
 
 [iSCSI]
diff --git a/test/iscsi_tgt/idle_migration/idle_migration.sh b/test/iscsi_tgt/idle_migration/idle_migration.sh
index 00b794d9c..bc503dfed 100755
--- a/test/iscsi_tgt/idle_migration/idle_migration.sh
+++ b/test/iscsi_tgt/idle_migration/idle_migration.sh
@@ -13,7 +13,7 @@ RPC_PORT=5260
 
 fio_py="python $rootdir/scripts/fio.py"
 
-$ISCSI_APP -c $testdir/iscsi.conf &
+$ISCSI_APP -c $testdir/iscsi.conf -m 0xFFFF &
 pid=$!
 echo "Process pid: $pid"
 
diff --git a/test/iscsi_tgt/idle_migration/iscsi.conf b/test/iscsi_tgt/idle_migration/iscsi.conf
index de468a01b..1a25fbf19 100644
--- a/test/iscsi_tgt/idle_migration/iscsi.conf
+++ b/test/iscsi_tgt/idle_migration/iscsi.conf
@@ -1,5 +1,4 @@
 [Global]
-  ReactorMask 0xFFFF
   LogFacility "local7"
 
 [iSCSI]
diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index f728852bc..936c3c7c2 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -41,7 +41,8 @@ do
 	cp $testdir/iscsi.conf $testdir/iscsi.conf.$i
 	port=$(($RPC_PORT + $i))
 	echo "Listen 127.0.0.1:$port" >> $testdir/iscsi.conf.$i
-	$ISCSI_APP -c $testdir/iscsi.conf.$i -s 1000 -i $i &
+	# TODO: run the different iSCSI instances on non-overlapping CPU masks
+	$ISCSI_APP -c $testdir/iscsi.conf.$i -s 1000 -i $i -m 0xFFFF &
 	pid=$!
 	echo "Process pid: $pid"
 
diff --git a/test/iscsi_tgt/ip_migration/iscsi.conf b/test/iscsi_tgt/ip_migration/iscsi.conf
index 06750038d..778508ad8 100755
--- a/test/iscsi_tgt/ip_migration/iscsi.conf
+++ b/test/iscsi_tgt/ip_migration/iscsi.conf
@@ -1,5 +1,4 @@
 [Global]
-  ReactorMask 0xFFFF
   LogFacility "local7"
 
 [iSCSI]
diff --git a/test/iscsi_tgt/rbd/iscsi.conf b/test/iscsi_tgt/rbd/iscsi.conf
index 0c90807d7..bcc80a845 100644
--- a/test/iscsi_tgt/rbd/iscsi.conf
+++ b/test/iscsi_tgt/rbd/iscsi.conf
@@ -1,5 +1,4 @@
 [Global]
-  ReactorMask 0xFFFF
   LogFacility "local7"
 
 [iSCSI]
diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh
index d7b99880c..464065ac5 100755
--- a/test/iscsi_tgt/rbd/rbd.sh
+++ b/test/iscsi_tgt/rbd/rbd.sh
@@ -27,7 +27,7 @@ NETMASK=$INITIATOR_IP/32
 rpc_py="python $rootdir/scripts/rpc.py"
 fio_py="python $rootdir/scripts/fio.py"
 
-$ISCSI_APP -c $testdir/iscsi.conf &
+$ISCSI_APP -c $testdir/iscsi.conf -m 0xFFFF &
 pid=$!
 
 trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT