diff --git a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs b/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs
index 968abf7bf2..a314577801 100644
--- a/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs
+++ b/fuzzers/backtrace_baby_fuzzers/forkserver_executor/src/main.rs
@@ -85,15 +85,12 @@ pub fn main() {
     // A fuzzer with feedbacks and a corpus scheduler
     let mut fuzzer = StdFuzzer::new(scheduler, feedback, objective);
 
-    // Create the executor for the forkserver
-    let mut executor = ForkserverExecutor::with_shmem_inputs(
-        "./target/release/program".to_string(),
-        &[],
-        tuple_list!(edges_observer, bt_observer),
-        true,
-        &mut shmem_provider,
-    )
-    .expect("Failed to create the executor.");
+    let mut executor = ForkserverExecutor::builder()
+        .program("./target/release/program".to_string())
+        .arg("@@")
+        .shmem_provider(&mut shmem_provider)
+        .build(tuple_list!(bt_observer, edges_observer))
+        .unwrap();
 
     // Generator of printable bytearrays of max size 32
     let mut generator = RandPrintablesGenerator::new(3);
diff --git a/scripts/test_all_fuzzers.sh b/scripts/test_all_fuzzers.sh
index 93f53d1eb4..464fdf7f0d 100755
--- a/scripts/test_all_fuzzers.sh
+++ b/scripts/test_all_fuzzers.sh
@@ -7,6 +7,7 @@ cd "$SCRIPT_DIR/.."
 
 fuzzers=$(find ./fuzzers -maxdepth 1 -type d)
 backtrace_fuzzers=$(find ./fuzzers/backtrace_baby_fuzzers -maxdepth 1 -type d)
+libafl=$(pwd)
 
 for fuzzer in $(echo $fuzzers $backtrace_fuzzers);
 do
@@ -34,6 +35,6 @@ do
 
     # Save disk space
     cargo clean
-    cd ..
+    cd $libafl
     echo ""
 done