diff --git a/lib/features/popup-menu/index.js b/lib/features/popup-menu/index.js
index db8cc96e..eaaa4bfa 100644
--- a/lib/features/popup-menu/index.js
+++ b/lib/features/popup-menu/index.js
@@ -1,4 +1,8 @@
 module.exports = {
+  __depends__: [
+    require('diagram-js/lib/features/popup-menu'),
+    require('../replace')
+  ],
   __init__: [ 'replaceMenuProvider' ],
   replaceMenuProvider: [ 'type', require('./ReplaceMenuProvider') ]
 };
\ No newline at end of file
diff --git a/lib/features/replace/index.js b/lib/features/replace/index.js
index 8f7ed6ca..c8b5a7eb 100644
--- a/lib/features/replace/index.js
+++ b/lib/features/replace/index.js
@@ -1,6 +1,5 @@
 module.exports = {
   __depends__: [
-    require('diagram-js/lib/features/popup-menu'),
     require('diagram-js/lib/features/replace'),
     require('diagram-js/lib/features/selection')
   ],
diff --git a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
index fe62eed7..35268385 100644
--- a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
+++ b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
@@ -7,9 +7,7 @@ var TestHelper = require('../../../TestHelper');
 var globalEvent = require('../../../util/MockEvents.js').createEvent;
 
 var coreModule = require('../../../../lib/core'),
-    popupMenuModule = require('diagram-js/lib/features/popup-menu'),
     modelingModule = require('../../../../lib/features/modeling'),
-    replaceModule = require('../../../../lib/features/replace'),
     replaceMenuProviderModule = require('../../../../lib/features/popup-menu'),
     customRulesModule = require('../../../util/custom-rules');
 
@@ -60,8 +58,6 @@ describe('features/popup-menu - replace menu provider', function() {
   var testModules = [
     coreModule,
     modelingModule,
-    popupMenuModule,
-    replaceModule,
     replaceMenuProviderModule,
     customRulesModule
   ];