diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index dc9d28112a..5c48099051 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -8,6 +8,10 @@ function local_setup_file() {
   # don't load any libraries as the tests here test the *whole* kit
 }
 
+function local_setup() {
+  : "${PROMPT_COMMAND:=}" "${BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE:=}"
+}
+
 @test "bash-it: verify that the test fixture is available" {
   assert_file_exist "${BASH_IT?}/aliases/available/a.aliases.bash"
   assert_file_exist "${BASH_IT?}/aliases/available/b.aliases.bash"
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 7fe60e3e19..06de167992 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -36,7 +36,7 @@ function __check_completion() {
 
   # Word index of the last word
   COMP_CWORD=$(( ${#COMP_WORDS[@]} - 1 ))
-
+  COMP_WORDS+=('') # arg
   # Run the Bash-it completion function
   _bash-it
 
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index c9c53b6dae..d5465cbc04 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -7,6 +7,7 @@ function local_setup_file() {
 }
 
 function local_setup() {
+  : "${BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE:=}"
   # Copy the test fixture to the Bash-it folder
   cp -RP "${BASH_IT?}/test/fixtures/bash_it"/* "${BASH_IT?}/"
 }
diff --git a/test/lib/preexec.bats b/test/lib/preexec.bats
index 3c5ed4b041..c1bdcfec67 100644
--- a/test/lib/preexec.bats
+++ b/test/lib/preexec.bats
@@ -6,6 +6,7 @@ load ../test_helper
 function local_setup {
 	setup_test_fixture
 	export __bp_enable_subshells=yas
+	export HISTCONTROL=""
 }
 
 @test "vendor preexec: __bp_install_after_session_init() without existing" {
diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats
index 78913870e5..c0c08d0505 100644
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -4,6 +4,8 @@ load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
 function local_setup_file() {
   setup_libs "helpers"
+  # shellcheck disable=SC2034
+  BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE=""
 }
 
 @test "_bash-it-component-item-is-enabled() - for a disabled item" {