diff --git a/.gitignore b/.gitignore
index fff155f1..b5f6149e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 __pycache__
 .config.yaml*
 .kas_shell_history
+.isar_test_shell_history
 build*
diff --git a/testsuite/dockerdata/test-container-entrypoint b/testsuite/dockerdata/test-container-entrypoint
index aa3def79..49771c15 100755
--- a/testsuite/dockerdata/test-container-entrypoint
+++ b/testsuite/dockerdata/test-container-entrypoint
@@ -121,7 +121,7 @@ EOF
 cd /isar
 
 if [ "${start_shell}" = 1 ]; then
-	bash
+	HISTFILE=/work/.isar_test_shell_history bash
 else
 	set -x
 	avocado ${showopt} run ${args}