diff --git a/test/fixtures/bpmn/render/conditional-flow.bpmn b/test/fixtures/bpmn/render/conditional-flow.bpmn
new file mode 100644
index 00000000..ede91e23
--- /dev/null
+++ b/test/fixtures/bpmn/render/conditional-flow.bpmn
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+             xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             expressionLanguage="http://www.w3.org/1999/XPath"
+             typeLanguage="http://www.w3.org/2001/XMLSchema"
+             xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd">
+    <process id="sid-3c7531ae-118a-47d2-b063-f08277ec0883" isClosed="false" isExecutable="false" processType="None">
+        <task completionQuantity="1" id="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489" isForCompensation="false" name="A" startQuantity="1">
+            <outgoing>sid-3FA58AD7-6491-4C89-A636-42E47488D426</outgoing>
+            <outgoing>sid-82C30D2C-10BC-4035-8A14-B50298F120E9</outgoing>
+            <outgoing>sid-A35FA3B7-318C-49FE-8446-70B6EC8329A5</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-FB6CC0EC-C019-4C8C-B860-318737AA947A" isForCompensation="false" name="B" startQuantity="1">
+            <incoming>sid-A35FA3B7-318C-49FE-8446-70B6EC8329A5</incoming>
+        </task>
+        <task completionQuantity="1" id="sid-6BE2FF1B-51B7-441F-A2A8-72285810FDB1" isForCompensation="false" name="C" startQuantity="1">
+            <incoming>sid-3FA58AD7-6491-4C89-A636-42E47488D426</incoming>
+        </task>
+        <task completionQuantity="1" id="sid-88D4DFBF-A30A-4A01-958F-81D460034146" isForCompensation="false" name="T1" startQuantity="1">
+            <incoming>sid-82C30D2C-10BC-4035-8A14-B50298F120E9</incoming>
+            <outgoing>sid-262FECFE-432B-42B6-AAF7-040A6B6D1880</outgoing>
+        </task>
+        <exclusiveGateway default="sid-314B00E4-B24D-485E-B645-5D692C5AD9DE" gatewayDirection="Diverging" id="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC">
+            <incoming>sid-262FECFE-432B-42B6-AAF7-040A6B6D1880</incoming>
+            <outgoing>sid-F35A9A61-6B46-4F0F-8885-FC17ED3D3CBB</outgoing>
+            <outgoing>sid-314B00E4-B24D-485E-B645-5D692C5AD9DE</outgoing>
+        </exclusiveGateway>
+        <task completionQuantity="1" id="sid-F08DF3C0-AC64-4563-A5AE-E5E807602626" isForCompensation="false" name="T2.0" startQuantity="1">
+            <incoming>sid-314B00E4-B24D-485E-B645-5D692C5AD9DE</incoming>
+            <outgoing>sid-AF879D05-477F-45C5-A8CB-C3C5FC1F70E9</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-5364BA85-ADC2-4300-AF86-A69A13A4EF4A" isForCompensation="false" name="T2.1" startQuantity="1">
+            <incoming>sid-F35A9A61-6B46-4F0F-8885-FC17ED3D3CBB</incoming>
+            <outgoing>sid-54D7C967-8E1B-4282-82C4-E3105B6AC0AC</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF" isForCompensation="false" name="T3.0" startQuantity="1">
+            <incoming>sid-AF879D05-477F-45C5-A8CB-C3C5FC1F70E9</incoming>
+            <incoming>sid-54D7C967-8E1B-4282-82C4-E3105B6AC0AC</incoming>
+            <outgoing>sid-3A48A6D4-00FD-453B-89CE-A453D68C2732</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-1A80193A-728A-4C6D-9B6E-0C1A4E07F6F1" isForCompensation="false" name="T4.0" startQuantity="1">
+            <incoming>sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0</incoming>
+            <outgoing>sid-19AA87BE-9229-4063-83A9-AC10C98C1D67</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-5E8BF6D5-F8C5-47FD-9201-3A4D54103011" isForCompensation="false" name="T4.1" startQuantity="1">
+            <incoming>sid-AA6359EA-B251-41E9-8A80-5870C35203FB</incoming>
+            <outgoing>sid-05966EA5-FA89-4F41-B59E-BEF1F717B05F</outgoing>
+        </task>
+        <task completionQuantity="1" id="sid-4D0F194A-4CE9-4F35-BDE8-A8CC26149238" isForCompensation="false" name="T4.2" startQuantity="1">
+            <incoming>sid-1C6223C2-572C-4B53-82B3-A7498A046B3E</incoming>
+            <outgoing>sid-DB9390D1-45D2-4A16-BEA3-D14D8715E057</outgoing>
+        </task>
+        <inclusiveGateway default="sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0" gatewayDirection="Diverging" id="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F">
+            <incoming>sid-3A48A6D4-00FD-453B-89CE-A453D68C2732</incoming>
+            <outgoing>sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0</outgoing>
+            <outgoing>sid-AA6359EA-B251-41E9-8A80-5870C35203FB</outgoing>
+            <outgoing>sid-1C6223C2-572C-4B53-82B3-A7498A046B3E</outgoing>
+        </inclusiveGateway>
+        <inclusiveGateway gatewayDirection="Converging" id="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279">
+            <incoming>sid-19AA87BE-9229-4063-83A9-AC10C98C1D67</incoming>
+            <incoming>sid-05966EA5-FA89-4F41-B59E-BEF1F717B05F</incoming>
+            <incoming>sid-DB9390D1-45D2-4A16-BEA3-D14D8715E057</incoming>
+            <outgoing>sid-BBFAEEF1-BEFC-43DD-B045-4D7B662868A7</outgoing>
+        </inclusiveGateway>
+        <endEvent id="sid-674E5CB1-EC18-4574-8D3E-9C1ABC71673C">
+            <incoming>sid-BBFAEEF1-BEFC-43DD-B045-4D7B662868A7</incoming>
+        </endEvent>
+        <sequenceFlow id="sid-3FA58AD7-6491-4C89-A636-42E47488D426" isImmediate="true" sourceRef="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489" targetRef="sid-6BE2FF1B-51B7-441F-A2A8-72285810FDB1">
+            <conditionExpression id="sid-7d146f68-3b11-4326-b9a1-9608b43b69b9" xsi:type="tFormalExpression">#{selectedFlow=='A'}</conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-82C30D2C-10BC-4035-8A14-B50298F120E9" isImmediate="true" sourceRef="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489" targetRef="sid-88D4DFBF-A30A-4A01-958F-81D460034146">
+        </sequenceFlow>
+        <sequenceFlow id="sid-A35FA3B7-318C-49FE-8446-70B6EC8329A5" isImmediate="true" sourceRef="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489" targetRef="sid-FB6CC0EC-C019-4C8C-B860-318737AA947A">
+            <conditionExpression id="sid-b92c9a82-af18-49e6-aeb8-d7744fa2cc95" xsi:type="tFormalExpression">#{selectedFlow=='B'}</conditionExpression>
+        </sequenceFlow>
+        <sequenceFlow id="sid-262FECFE-432B-42B6-AAF7-040A6B6D1880" sourceRef="sid-88D4DFBF-A30A-4A01-958F-81D460034146" targetRef="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC" />
+        <sequenceFlow id="sid-F35A9A61-6B46-4F0F-8885-FC17ED3D3CBB" sourceRef="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC" targetRef="sid-5364BA85-ADC2-4300-AF86-A69A13A4EF4A" />
+        <sequenceFlow id="sid-314B00E4-B24D-485E-B645-5D692C5AD9DE" sourceRef="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC" targetRef="sid-F08DF3C0-AC64-4563-A5AE-E5E807602626" />
+        <sequenceFlow id="sid-AF879D05-477F-45C5-A8CB-C3C5FC1F70E9" sourceRef="sid-F08DF3C0-AC64-4563-A5AE-E5E807602626" targetRef="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF" />
+        <sequenceFlow id="sid-54D7C967-8E1B-4282-82C4-E3105B6AC0AC" sourceRef="sid-5364BA85-ADC2-4300-AF86-A69A13A4EF4A" targetRef="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF" />
+        <sequenceFlow id="sid-3A48A6D4-00FD-453B-89CE-A453D68C2732" sourceRef="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF" targetRef="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F" />
+        <sequenceFlow id="sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0" sourceRef="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F" targetRef="sid-1A80193A-728A-4C6D-9B6E-0C1A4E07F6F1" />
+        <sequenceFlow id="sid-AA6359EA-B251-41E9-8A80-5870C35203FB" sourceRef="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F" targetRef="sid-5E8BF6D5-F8C5-47FD-9201-3A4D54103011" />
+        <sequenceFlow id="sid-1C6223C2-572C-4B53-82B3-A7498A046B3E" sourceRef="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F" targetRef="sid-4D0F194A-4CE9-4F35-BDE8-A8CC26149238" />
+        <sequenceFlow id="sid-19AA87BE-9229-4063-83A9-AC10C98C1D67" sourceRef="sid-1A80193A-728A-4C6D-9B6E-0C1A4E07F6F1" targetRef="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279" />
+        <sequenceFlow id="sid-05966EA5-FA89-4F41-B59E-BEF1F717B05F" sourceRef="sid-5E8BF6D5-F8C5-47FD-9201-3A4D54103011" targetRef="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279" />
+        <sequenceFlow id="sid-DB9390D1-45D2-4A16-BEA3-D14D8715E057" sourceRef="sid-4D0F194A-4CE9-4F35-BDE8-A8CC26149238" targetRef="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279" />
+        <sequenceFlow id="sid-BBFAEEF1-BEFC-43DD-B045-4D7B662868A7" sourceRef="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279" targetRef="sid-674E5CB1-EC18-4574-8D3E-9C1ABC71673C" />
+    </process>
+    <bpmndi:BPMNDiagram id="sid-6ec6a804-a73d-4fd4-92cc-c5c6e68ad655">
+        <bpmndi:BPMNPlane bpmnElement="sid-3c7531ae-118a-47d2-b063-f08277ec0883" id="sid-c9d74743-7b75-44e2-b5aa-18b330709533">
+            <bpmndi:BPMNShape bpmnElement="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489" id="sid-D0D3D1AD-750F-498E-B7E3-A2069571F489_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="60.0" y="225.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="8.571426391601562" x="105.71428680419922" y="257.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-FB6CC0EC-C019-4C8C-B860-318737AA947A" id="sid-FB6CC0EC-C019-4C8C-B860-318737AA947A_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="90.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="8.571426391601562" x="315.7142868041992" y="122.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-6BE2FF1B-51B7-441F-A2A8-72285810FDB1" id="sid-6BE2FF1B-51B7-441F-A2A8-72285810FDB1_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="375.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="8.571426391601562" x="315.7142868041992" y="407.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-88D4DFBF-A30A-4A01-958F-81D460034146" id="sid-88D4DFBF-A30A-4A01-958F-81D460034146_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="270.0" y="225.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="15.428573608398438" x="312.2857131958008" y="257.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC" id="sid-386727C5-9FC7-4C8A-B2BA-D491C9B440AC_gui" isMarkerVisible="true">
+                <omgdc:Bounds height="40.0" width="40.0" x="425.0" y="245.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-F08DF3C0-AC64-4563-A5AE-E5E807602626" id="sid-F08DF3C0-AC64-4563-A5AE-E5E807602626_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="510.0" y="150.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="546.2857131958008" y="182.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-5364BA85-ADC2-4300-AF86-A69A13A4EF4A" id="sid-5364BA85-ADC2-4300-AF86-A69A13A4EF4A_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="510.0" y="290.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="546.2857131958008" y="322.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF" id="sid-E6DFCF17-66AB-43B0-9DA7-E0A1DC1BD1BF_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="675.0" y="225.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="711.2857131958008" y="257.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-1A80193A-728A-4C6D-9B6E-0C1A4E07F6F1" id="sid-1A80193A-728A-4C6D-9B6E-0C1A4E07F6F1_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="905.0" y="100.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="941.2857131958008" y="132.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-5E8BF6D5-F8C5-47FD-9201-3A4D54103011" id="sid-5E8BF6D5-F8C5-47FD-9201-3A4D54103011_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="905.0" y="225.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="941.2857131958008" y="257.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-4D0F194A-4CE9-4F35-BDE8-A8CC26149238" id="sid-4D0F194A-4CE9-4F35-BDE8-A8CC26149238_gui">
+                <omgdc:Bounds height="80.0" width="100.0" x="905.0" y="350.0"/>
+                <bpmndi:BPMNLabel labelStyle="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+                    <omgdc:Bounds height="12.0" width="27.428573608398438" x="941.2857131958008" y="382.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F" id="sid-6481D745-1F8A-43EE-BBF3-3F16E9312B6F_gui">
+                <omgdc:Bounds height="40.0" width="40.0" x="820.0" y="245.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279" id="sid-C4BFC4C1-CBCF-4FA2-8544-A17ED72D0279_gui">
+                <omgdc:Bounds height="40.0" width="40.0" x="1070.0" y="245.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape bpmnElement="sid-674E5CB1-EC18-4574-8D3E-9C1ABC71673C" id="sid-674E5CB1-EC18-4574-8D3E-9C1ABC71673C_gui">
+                <omgdc:Bounds height="28.0" width="28.0" x="1175.0" y="251.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge bpmnElement="sid-DB9390D1-45D2-4A16-BEA3-D14D8715E057" id="sid-DB9390D1-45D2-4A16-BEA3-D14D8715E057_gui">
+                <omgdi:waypoint x="1005.0" y="390.0"/>
+                <omgdi:waypoint x="1090.5" y="390.0"/>
+                <omgdi:waypoint x="1090.5" y="285.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-3FA58AD7-6491-4C89-A636-42E47488D426" id="sid-3FA58AD7-6491-4C89-A636-42E47488D426_gui">
+                <omgdi:waypoint x="110.0" y="305.0"/>
+                <omgdi:waypoint x="110.0" y="415.0"/>
+                <omgdi:waypoint x="270.0" y="415.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-82C30D2C-10BC-4035-8A14-B50298F120E9" id="sid-82C30D2C-10BC-4035-8A14-B50298F120E9_gui">
+                <omgdi:waypoint x="160.0" y="265.0"/>
+                <omgdi:waypoint x="270.0" y="265.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-1C6223C2-572C-4B53-82B3-A7498A046B3E" id="sid-1C6223C2-572C-4B53-82B3-A7498A046B3E_gui">
+                <omgdi:waypoint x="840.5" y="285.0"/>
+                <omgdi:waypoint x="840.5" y="390.0"/>
+                <omgdi:waypoint x="905.0" y="390.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0" id="sid-52DA4A1B-A188-4866-AD39-ED24F6BDF9D0_gui">
+                <omgdi:waypoint x="840.5" y="245.0"/>
+                <omgdi:waypoint x="840.5" y="140.0"/>
+                <omgdi:waypoint x="905.0" y="140.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-262FECFE-432B-42B6-AAF7-040A6B6D1880" id="sid-262FECFE-432B-42B6-AAF7-040A6B6D1880_gui">
+                <omgdi:waypoint x="370.0" y="265.199203187251"/>
+                <omgdi:waypoint x="425.0" y="265.4183266932271"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-3A48A6D4-00FD-453B-89CE-A453D68C2732" id="sid-3A48A6D4-00FD-453B-89CE-A453D68C2732_gui">
+                <omgdi:waypoint x="775.0" y="265.2164502164502"/>
+                <omgdi:waypoint x="820.0" y="265.4112554112554"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-AF879D05-477F-45C5-A8CB-C3C5FC1F70E9" id="sid-AF879D05-477F-45C5-A8CB-C3C5FC1F70E9_gui">
+                <omgdi:waypoint x="610.0" y="190.0"/>
+                <omgdi:waypoint x="632.5" y="190.0"/>
+                <omgdi:waypoint x="632.5" y="265.0"/>
+                <omgdi:waypoint x="675.0" y="265.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-AA6359EA-B251-41E9-8A80-5870C35203FB" id="sid-AA6359EA-B251-41E9-8A80-5870C35203FB_gui">
+                <omgdi:waypoint x="860.0" y="265.414847161572"/>
+                <omgdi:waypoint x="905.0" y="265.2183406113537"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-314B00E4-B24D-485E-B645-5D692C5AD9DE" id="sid-314B00E4-B24D-485E-B645-5D692C5AD9DE_gui">
+                <omgdi:waypoint x="445.5" y="245.0"/>
+                <omgdi:waypoint x="445.5" y="190.0"/>
+                <omgdi:waypoint x="510.0" y="190.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-54D7C967-8E1B-4282-82C4-E3105B6AC0AC" id="sid-54D7C967-8E1B-4282-82C4-E3105B6AC0AC_gui">
+                <omgdi:waypoint x="610.0" y="330.0"/>
+                <omgdi:waypoint x="632.5" y="330.0"/>
+                <omgdi:waypoint x="632.5" y="265.0"/>
+                <omgdi:waypoint x="675.0" y="265.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-19AA87BE-9229-4063-83A9-AC10C98C1D67" id="sid-19AA87BE-9229-4063-83A9-AC10C98C1D67_gui">
+                <omgdi:waypoint x="1005.0" y="140.0"/>
+                <omgdi:waypoint x="1090.5" y="140.0"/>
+                <omgdi:waypoint x="1090.5" y="245.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-BBFAEEF1-BEFC-43DD-B045-4D7B662868A7" id="sid-BBFAEEF1-BEFC-43DD-B045-4D7B662868A7_gui">
+                <omgdi:waypoint x="1110.0" y="265.4010152284264"/>
+                <omgdi:waypoint x="1175.0" y="265.07106598984774"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-05966EA5-FA89-4F41-B59E-BEF1F717B05F" id="sid-05966EA5-FA89-4F41-B59E-BEF1F717B05F_gui">
+                <omgdi:waypoint x="1005.0" y="265.1845018450185"/>
+                <omgdi:waypoint x="1070.0" y="265.42435424354244"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-F35A9A61-6B46-4F0F-8885-FC17ED3D3CBB" id="sid-F35A9A61-6B46-4F0F-8885-FC17ED3D3CBB_gui">
+                <omgdi:waypoint x="445.5" y="285.0"/>
+                <omgdi:waypoint x="445.5" y="330.0"/>
+                <omgdi:waypoint x="510.0" y="330.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge bpmnElement="sid-A35FA3B7-318C-49FE-8446-70B6EC8329A5" id="sid-A35FA3B7-318C-49FE-8446-70B6EC8329A5_gui">
+                <omgdi:waypoint x="110.0" y="225.0"/>
+                <omgdi:waypoint x="110.0" y="130.0"/>
+                <omgdi:waypoint x="270.0" y="130.0"/>
+            </bpmndi:BPMNEdge>
+        </bpmndi:BPMNPlane>
+        <bpmndi:BPMNLabelStyle id="sid-5fcc1b17-d762-4d13-aaa9-b23d5d517d5d">
+            <omgdc:Font isBold="false" isItalic="false" isStrikeThrough="false" isUnderline="false" name="Arial" size="12.0"/>
+        </bpmndi:BPMNLabelStyle>
+    </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/test/spec/browser/draw/BpmnRendererSpec.js b/test/spec/browser/draw/BpmnRendererSpec.js
index b8d409c6..4a6a62b8 100644
--- a/test/spec/browser/draw/BpmnRendererSpec.js
+++ b/test/spec/browser/draw/BpmnRendererSpec.js
@@ -17,6 +17,17 @@ describe('draw/BpmnRenderer', function() {
   });
 
 
+  it('should render conditional flows', function(done) {
+
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow.bpmn', 'utf8');
+
+    var renderer = new Viewer(container);
+
+    renderer.importXML(xml, function(err) {
+      done(err);
+    });
+  });
+
   it('should render text annotations', function(done) {
 
     var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/text-annotation.bpmn', 'utf8');