diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b465e2fb..1699e173 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -50,12 +50,16 @@ if(BUILD_CXXLIBS)
         COMMAND ${BUSYBOX_EXE} ${BUSYBOX_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/test_libFLAC++.sh"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     list(APPEND ALL_TESTS libFLAC++)
+    set_tests_properties(libFLAC++ PROPERTIES DEPENDS libFLAC)
 endif()
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cuesheets")
 add_test(NAME grabbag
     COMMAND ${BUSYBOX_EXE} ${BUSYBOX_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/test_grabbag.sh"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 if(BUILD_PROGRAMS)
+    add_test(NAME generate_streams
+        COMMAND ${BUSYBOX_EXE} ${BUSYBOX_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/generate_streams.sh"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     add_test(NAME flac
         COMMAND ${BUSYBOX_EXE} ${BUSYBOX_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/test_flac.sh"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
@@ -85,7 +89,8 @@ if(BUILD_PROGRAMS)
     add_test(NAME compression
         COMMAND ${BUSYBOX_EXE} ${BUSYBOX_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/test_compression.sh"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    list(APPEND ALL_TESTS flac metaflac replaygain seeking streams compression)
+    set_tests_properties(flac metaflac replaygain seeking streams compression PROPERTIES DEPENDS generate_streams)
+    list(APPEND ALL_TESTS generate_streams flac metaflac replaygain seeking streams compression)
 endif()
 
 
diff --git a/test/generate_streams.sh b/test/generate_streams.sh
new file mode 100755
index 00000000..62887c01
--- /dev/null
+++ b/test/generate_streams.sh
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+#  FLAC - Free Lossless Audio Codec
+#  Copyright (C) 2001-2009  Josh Coalson
+#  Copyright (C) 2011-2022  Xiph.Org Foundation
+#
+#  This file is part the FLAC project.  FLAC is comprised of several
+#  components distributed under different licenses.  The codec libraries
+#  are distributed under Xiph.Org's BSD-like license (see the file
+#  COPYING.Xiph in this distribution).  All other programs, libraries, and
+#  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
+#  is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
+#  FLAC distribution contains at the top the terms under which it may be
+#  distributed.
+#
+#  Since this particular file is relevant to all components of FLAC,
+#  it may be distributed under the Xiph.Org license, which is the least
+#  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+#  distribution.
+
+. ./common.sh
+
+PATH="$(pwd)/../src/test_streams:$PATH"
+PATH="$(pwd)/../objs/$BUILD/bin:$PATH"
+
+echo "Generating streams..."
+if [ ! -f wacky1.wav ] ; then
+	test_streams || die "ERROR during test_streams"
+fi