diff --git a/test/fixtures/bpmn/render/activity-markers-combination.bpmn b/test/fixtures/bpmn/draw/activity-markers-combination.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/activity-markers-combination.bpmn
rename to test/fixtures/bpmn/draw/activity-markers-combination.bpmn
diff --git a/test/fixtures/bpmn/render/activity-markers.bpmn b/test/fixtures/bpmn/draw/activity-markers.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/activity-markers.bpmn
rename to test/fixtures/bpmn/draw/activity-markers.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-flow-default.bpmn b/test/fixtures/bpmn/draw/conditional-flow-default.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/conditional-flow-default.bpmn
rename to test/fixtures/bpmn/draw/conditional-flow-default.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-flow-gateways.bpmn b/test/fixtures/bpmn/draw/conditional-flow-gateways.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/conditional-flow-gateways.bpmn
rename to test/fixtures/bpmn/draw/conditional-flow-gateways.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-flow-typed-task.bpmn b/test/fixtures/bpmn/draw/conditional-flow-typed-task.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/conditional-flow-typed-task.bpmn
rename to test/fixtures/bpmn/draw/conditional-flow-typed-task.bpmn
diff --git a/test/fixtures/bpmn/render/conditional-flow.bpmn b/test/fixtures/bpmn/draw/conditional-flow.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/conditional-flow.bpmn
rename to test/fixtures/bpmn/draw/conditional-flow.bpmn
diff --git a/test/fixtures/bpmn/render/data-objects.bpmn b/test/fixtures/bpmn/draw/data-objects.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/data-objects.bpmn
rename to test/fixtures/bpmn/draw/data-objects.bpmn
diff --git a/test/fixtures/bpmn/render/event-subprocesses-collapsed.bpmn b/test/fixtures/bpmn/draw/event-subprocesses-collapsed.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/event-subprocesses-collapsed.bpmn
rename to test/fixtures/bpmn/draw/event-subprocesses-collapsed.bpmn
diff --git a/test/fixtures/bpmn/render/event-subprocesses-expanded.bpmn b/test/fixtures/bpmn/draw/event-subprocesses-expanded.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/event-subprocesses-expanded.bpmn
rename to test/fixtures/bpmn/draw/event-subprocesses-expanded.bpmn
diff --git a/test/fixtures/bpmn/render/events-interrupting.bpmn b/test/fixtures/bpmn/draw/events-interrupting.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/events-interrupting.bpmn
rename to test/fixtures/bpmn/draw/events-interrupting.bpmn
diff --git a/test/fixtures/bpmn/render/events.bpmn b/test/fixtures/bpmn/draw/events.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/events.bpmn
rename to test/fixtures/bpmn/draw/events.bpmn
diff --git a/test/fixtures/bpmn/render/gateways.bpmn b/test/fixtures/bpmn/draw/gateways.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/gateways.bpmn
rename to test/fixtures/bpmn/draw/gateways.bpmn
diff --git a/test/fixtures/bpmn/render/group.bpmn b/test/fixtures/bpmn/draw/group.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/group.bpmn
rename to test/fixtures/bpmn/draw/group.bpmn
diff --git a/test/fixtures/bpmn/render/message-marker.bpmn b/test/fixtures/bpmn/draw/message-marker.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/message-marker.bpmn
rename to test/fixtures/bpmn/draw/message-marker.bpmn
diff --git a/test/fixtures/bpmn/render/pools-with-collection-marker.bpmn b/test/fixtures/bpmn/draw/pools-with-collection-marker.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/pools-with-collection-marker.bpmn
rename to test/fixtures/bpmn/draw/pools-with-collection-marker.bpmn
diff --git a/test/fixtures/bpmn/render/pools.bpmn b/test/fixtures/bpmn/draw/pools.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/pools.bpmn
rename to test/fixtures/bpmn/draw/pools.bpmn
diff --git a/test/fixtures/bpmn/render/task-types.bpmn b/test/fixtures/bpmn/draw/task-types.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/task-types.bpmn
rename to test/fixtures/bpmn/draw/task-types.bpmn
diff --git a/test/fixtures/bpmn/render/text-annotation.bpmn b/test/fixtures/bpmn/draw/text-annotation.bpmn
similarity index 100%
rename from test/fixtures/bpmn/render/text-annotation.bpmn
rename to test/fixtures/bpmn/draw/text-annotation.bpmn
diff --git a/test/fixtures/bpmn/labels/collaboration.bpmn b/test/fixtures/bpmn/import/labels/collaboration.bpmn
similarity index 100%
rename from test/fixtures/bpmn/labels/collaboration.bpmn
rename to test/fixtures/bpmn/import/labels/collaboration.bpmn
diff --git a/test/fixtures/bpmn/labels/embedded.bpmn b/test/fixtures/bpmn/import/labels/embedded.bpmn
similarity index 100%
rename from test/fixtures/bpmn/labels/embedded.bpmn
rename to test/fixtures/bpmn/import/labels/embedded.bpmn
diff --git a/test/fixtures/bpmn/labels/external-no-di.bpmn b/test/fixtures/bpmn/import/labels/external-no-di.bpmn
similarity index 100%
rename from test/fixtures/bpmn/labels/external-no-di.bpmn
rename to test/fixtures/bpmn/import/labels/external-no-di.bpmn
diff --git a/test/fixtures/bpmn/labels/external.bpmn b/test/fixtures/bpmn/import/labels/external.bpmn
similarity index 100%
rename from test/fixtures/bpmn/labels/external.bpmn
rename to test/fixtures/bpmn/import/labels/external.bpmn
diff --git a/test/fixtures/bpmn/process/standard-process.bpmn b/test/fixtures/bpmn/simple-process.bpmn
similarity index 100%
rename from test/fixtures/bpmn/process/standard-process.bpmn
rename to test/fixtures/bpmn/simple-process.bpmn
diff --git a/test/spec/browser/draw/BpmnRendererSpec.js b/test/spec/browser/draw/BpmnRendererSpec.js
index d0a5697b..ecae684e 100644
--- a/test/spec/browser/draw/BpmnRendererSpec.js
+++ b/test/spec/browser/draw/BpmnRendererSpec.js
@@ -21,7 +21,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render activity markers', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-markers.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/activity-markers.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -33,7 +33,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render activity markers (combination)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/activity-markers-combination.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/activity-markers-combination.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -45,7 +45,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render conditional flows', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/conditional-flow.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -57,7 +57,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render conditional default flows', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-default.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/conditional-flow-default.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -69,7 +69,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render NO conditional flow (gateway)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-gateways.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/conditional-flow-gateways.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -81,7 +81,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render conditional flow (typed task)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/conditional-flow-typed-task.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/conditional-flow-typed-task.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -93,7 +93,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render data objects', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/data-objects.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/data-objects.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -105,7 +105,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render events', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/events.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/events.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -117,7 +117,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render events (interrupting)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/events-interrupting.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/events-interrupting.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -129,7 +129,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render event subprocesses (collapsed)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/event-subprocesses-collapsed.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/event-subprocesses-collapsed.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -141,7 +141,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render event subprocesses (expanded)', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/event-subprocesses-expanded.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/event-subprocesses-expanded.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -153,7 +153,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render gateways', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/gateways.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/gateways.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -165,7 +165,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render group', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/group.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/group.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -177,7 +177,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render message marker', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/message-marker.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/message-marker.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -189,7 +189,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render pools', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/pools.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/pools.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -201,7 +201,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render pool collection marker', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/pools-with-collection-marker.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/pools-with-collection-marker.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -213,7 +213,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render task types', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/task-types.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/task-types.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
@@ -225,7 +225,7 @@ describe('draw/BpmnRenderer', function() {
 
   it('should render text annotations', function(done) {
 
-    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/render/text-annotation.bpmn', 'utf8');
+    var xml = fs.readFileSync(__dirname + '/../../../fixtures/bpmn/draw/text-annotation.bpmn', 'utf8');
 
     var renderer = new Viewer(container);
 
diff --git a/test/spec/browser/import/elements/LabelImportSpec.js b/test/spec/browser/import/elements/LabelImportSpec.js
index f1c1406f..2c68cfaa 100644
--- a/test/spec/browser/import/elements/LabelImportSpec.js
+++ b/test/spec/browser/import/elements/LabelImportSpec.js
@@ -23,7 +23,7 @@ describe('import - labels', function() {
 
     it('on flow nodes', function(done) {
 
-      var xml = fs.readFileSync('test/fixtures/bpmn/labels/embedded.bpmn', 'utf8');
+      var xml = fs.readFileSync('test/fixtures/bpmn/import/labels/embedded.bpmn', 'utf8');
 
       var renderer = new Viewer(container);
 
@@ -35,7 +35,7 @@ describe('import - labels', function() {
 
     it('on pools and lanes', function(done) {
 
-      var xml = fs.readFileSync('test/fixtures/bpmn/labels/collaboration.bpmn', 'utf8');
+      var xml = fs.readFileSync('test/fixtures/bpmn/import/labels/collaboration.bpmn', 'utf8');
 
       var renderer = new Viewer(container);
 
@@ -51,7 +51,7 @@ describe('import - labels', function() {
 
     it('with di', function(done) {
 
-      var xml = fs.readFileSync('test/fixtures/bpmn/labels/external.bpmn', 'utf8');
+      var xml = fs.readFileSync('test/fixtures/bpmn/import/labels/external.bpmn', 'utf8');
 
       var renderer = new Viewer(container);
 
@@ -63,7 +63,7 @@ describe('import - labels', function() {
 
     it('without di', function(done) {
 
-      var xml = fs.readFileSync('test/fixtures/bpmn/labels/external-no-di.bpmn', 'utf8');
+      var xml = fs.readFileSync('test/fixtures/bpmn/import/labels/external-no-di.bpmn', 'utf8');
 
       var renderer = new Viewer(container);