diff --git a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
index 171f7d08f2639cadbb8da1c21706335aa5085c66..100927523c6c8bad0595497290feac8623147e0d 100644
--- a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
+++ b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
@@ -15,13 +15,14 @@ from finn.transformation.fpgadataflow.make_pynq_proj import MakePYNQProject
 from finn.transformation.fpgadataflow.synth_pynq_proj import SynthPYNQProject
 from finn.transformation.general import GiveUniqueNodeNames
 
+# TODO control board/part for tests from a global place
 # settings for Ultra96
 test_fpga_part = "xczu3eg-sbva484-1-e"
 test_pynq_board = "Ultra96"
 
 # settings for PYNQ-Z1
-test_fpga_part = "xc7z020clg400-1"
-test_pynq_board = "Pynq-Z1"
+#test_fpga_part = "xc7z020clg400-1"
+#test_pynq_board = "Pynq-Z1"
 
 
 def create_two_fc_model():
@@ -138,12 +139,12 @@ def test_fpgadataflow_ipstitch_gen_two_fc_model():
     assert model.graph.node[0].op_type == "StreamingFCLayer_Batch"
     assert model.graph.node[1].op_type == "StreamingFCLayer_Batch"
     assert model.graph.node[2].op_type == "TLastMarker"
-    model.save("/tmp/test_fpgadataflow_ip_gen_two_fc_model.onnx")
+    model.save("/tmp/finn/test_fpgadataflow_ip_gen_two_fc_model.onnx")
 
 
 @pytest.mark.dependency(depends=["test_fpgadataflow_ipstitch_gen_two_fc_model"])
 def test_fpgadataflow_ipstitch_do_stitch():
-    model = ModelWrapper("/tmp/test_fpgadataflow_ip_gen_two_fc_model.onnx")
+    model = ModelWrapper("/tmp/finn/test_fpgadataflow_ip_gen_two_fc_model.onnx")
     model = model.transform(CodeGen_ipstitch(test_fpga_part))
     vivado_stitch_proj_dir = model.get_metadata_prop("vivado_stitch_proj")
     assert vivado_stitch_proj_dir is not None
@@ -152,22 +153,22 @@ def test_fpgadataflow_ipstitch_do_stitch():
     vivado_stitch_vlnv = model.get_metadata_prop("vivado_stitch_vlnv")
     assert vivado_stitch_vlnv is not None
     assert vivado_stitch_vlnv == "xilinx_finn:finn:finn_design:1.0"
-    model.save("/tmp/test_fpgadataflow_ip_stitch.onnx")
+    model.save("/tmp/finn/test_fpgadataflow_ip_stitch.onnx")
 
 
 @pytest.mark.dependency(depends=["test_fpgadataflow_ipstitch_do_stitch"])
 def test_fpgadataflow_ipstitch_pynq_projgen():
-    model = ModelWrapper("/tmp/test_fpgadataflow_ip_stitch.onnx")
+    model = ModelWrapper("/tmp/finn/test_fpgadataflow_ip_stitch.onnx")
     model = model.transform(MakePYNQProject(test_pynq_board))
     vivado_pynq_proj_dir = model.get_metadata_prop("vivado_pynq_proj")
     assert vivado_pynq_proj_dir is not None
     assert os.path.isdir(vivado_pynq_proj_dir)
-    model.save("/tmp/test_fpgadataflow_pynq_projgen.onnx")
+    model.save("/tmp/finn/test_fpgadataflow_pynq_projgen.onnx")
 
 
 @pytest.mark.dependency(depends=["test_fpgadataflow_ipstitch_pynq_projgen"])
 def test_fpgadataflow_ipstitch_pynq_synth():
-    model = ModelWrapper("/tmp/test_fpgadataflow_pynq_projgen.onnx")
+    model = ModelWrapper("/tmp/finn/test_fpgadataflow_pynq_projgen.onnx")
     model = model.transform(SynthPYNQProject())
     bitfile = model.get_metadata_prop("vivado_pynq_bitfile")
     assert bitfile is not None