diff --git a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
index 8ea6a3500955736ea3aaa803684b0e403b06a866..388accad3aa2bb2633fb691241d234442d59bb11 100644
--- a/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/cnv_end2end_example.ipynb
@@ -524,7 +524,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "model = ModelWrapper(build_dir + \"/end2end_cnv_w1a1_pynq_deploy.onnx\")\n",
+    "model = ModelWrapper(build_dir + \"/end2end_cnv_w1a1_synth.onnx\")\n",
     "iname = model.graph.input[0].name\n",
     "ishape = model.get_tensor_shape(iname)\n",
     "np.save(deployment_dir + \"/input.npy\", x.reshape(ishape))"
diff --git a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
index 7e9980cf2abf40219847eab2c0cd381cc32f6682..eec17b2fa7e8226cafe48f095aa38eb704b2812e 100644
--- a/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
+++ b/notebooks/end2end_example/bnn-pynq/tfc_end2end_example.ipynb
@@ -873,7 +873,7 @@
    "source": [
     "import numpy as np\n",
     "\n",
-    "model = ModelWrapper(build_dir + \"/tfc_w1_a1_pynq_deploy.onnx\")\n",
+    "model = ModelWrapper(build_dir + \"/tfc_w1_a1_post_synthesis.onnx\")\n",
     "iname = model.graph.input[0].name\n",
     "oname = parent_model.graph.output[0].name\n",
     "ishape = model.get_tensor_shape(iname)\n",
diff --git a/src/finn/qnn-data/build_dataflow/dataflow_build_config.json b/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
index 27ec38f6a4eb55c99dc4805f91d6e388e735308c..a053c1a22f7d3d290628c661a5cf113a3be44f53 100644
--- a/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
+++ b/src/finn/qnn-data/build_dataflow/dataflow_build_config.json
@@ -7,6 +7,7 @@
   "standalone_thresholds": true,
   "shell_flow_type": "vivado_zynq",
   "verify_save_rtlsim_waveforms": true,
+  "force_python_rtlsim": true,
   "verify_steps": [
     "initial_python",
     "streamlined_python",
diff --git a/tests/util/test_build_dataflow.py b/tests/util/test_build_dataflow.py
index 915e54f4e4ba2648dc7dfafce520862b55b7a8da..39f0b0dc89e9388c54a013becb53d9afbfb2ce4e 100644
--- a/tests/util/test_build_dataflow.py
+++ b/tests/util/test_build_dataflow.py
@@ -41,7 +41,6 @@ from finn.util.basic import make_build_dir
 @pytest.mark.slow
 @pytest.mark.vivado
 @pytest.mark.end2end
-@pytest.mark.xfail
 def test_end2end_build_dataflow_directory():
     test_dir = make_build_dir("test_build_dataflow_directory_")
     target_dir = test_dir + "/build_dataflow"