diff --git a/tests/test.bkl b/tests/test.bkl
index 37e072319e..1932b0ac07 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -3,6 +3,22 @@
 
 <makefile>
 
+    <!-- FIXME: temporary hack.
+         Override this on command line, e.g.
+         bakefile_gen -f autoconf -b ../../tests/*.bkl -DBUILD_STREAM_TESTS=1
+    -->
+    <set var="BUILD_STREAM_TESTS">0</set>
+
+    <set var="STREAMS_FILES">
+        <if cond="BUILD_STREAM_TESTS=='1'">
+            streams/bstream.cpp
+            streams/ffilestream.cpp
+            streams/filestream.cpp
+            streams/memstream.cpp
+            streams/zlibstream.cpp
+        </if>
+    </set>
+
     <include file="../build/bakefiles/common_samples.bkl"/>
 
     <exe id="test" template="wx_test_console"
@@ -15,6 +31,7 @@
             filesys/filesys.cpp
             arrays/arrays.cpp
             longlong/longlong.cpp
+            $(STREAMS_FILES)
         </sources>
         <wx-lib>base</wx-lib>
     </exe>