diff --git a/tool/autopilot b/tool/autopilot
index 1a6bd34941..4cd8130ee7 100755
--- a/tool/autopilot
+++ b/tool/autopilot
@@ -49,6 +49,7 @@ proc help { } {
 		                   [-k <kernel> ...]
 		                   [-r <run-script> ...]
 		                   [-d <test-dir>] [-j <make-jobs>]
+		                   [-i <info-file-name>]
 		                   [--help] [--cleanup] [--force] [--keep]
 		                   [--stdout] [--skip-clean-rules]
 		                   [--enable-ccache]
@@ -121,9 +122,16 @@ proc build_dir { platform } {
 ##
 # Return name of log file for test of 'run_script' on 'platform'
 #
+proc log_file_name { platform kernel run_script } {
+	return $platform.$kernel.$run_script.log
+}
+
+##
+# Return path to log file for test of 'run_script' on 'platform'
+#
 proc log_file { platform kernel run_script } {
 	global test_dir
-	return [file join $test_dir $platform.$kernel.$run_script.log]
+	return [file join $test_dir [log_file_name $platform $kernel $run_script]]
 }
 
 
@@ -329,6 +337,24 @@ foreach platform $platforms {
 }
 
 
+#
+# Create info file that contains all expected log files
+#
+
+set info_file "autopilot.log"
+foreach_cmdline_arg i { global info_file; set info_file $i }
+
+set info_fd [open [file join $test_dir $info_file] "WRONLY CREAT TRUNC"]
+foreach platform $platforms {
+	foreach kernel $kernels {
+		foreach run_script $run_scripts {
+			puts $info_fd "[log_file_name $platform $kernel $run_script]"
+		}
+	}
+}
+close $info_fd
+
+
 #
 # Revisit each platform's build directory and execute all test cases
 #