diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
index c78ccaa4a2..577a958ac2 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -50,13 +50,19 @@ SetupIncludes ;
 		malloc_debug_flags = -fcheck-memory-usage ;
 	}
 
+	# We need to use a wrapper for fstat() on non-BeOS systems.
+	local buildPlatformFstatDefines ;
+	if $(OS) != BEOS {
+		buildPlatformFstatDefines = build_platform_fstat=fs_shell_fstat ;
+	}
+
 	local defines = [ FDefines USER
 		#DEBUG
 		USED_IN_FS_SHELL NO_FILE_UNCACHED_IO
 		UNSAFE_GET_VNODE
 		#BFS_BIG_ENDIAN_ONLY
 		$(malloc_debug_defines)
-		build_platform_fstat=fs_shell_fstat
+		$(buildPlatformFstatDefines)
 	] ;
 	SubDirCcFlags $(defines) $(malloc_debug_flags) ;
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti $(malloc_debug_flags)