diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..c630ffa
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
diff --git a/README.md b/README.md
index 3ca2ced..44c6f9b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ that depends on ZfcBase.
 
 ## Requirements
 
-* Zend Framework 2
+* Zend Framework 3
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index 76865db..0c138da 100644
--- a/composer.json
+++ b/composer.json
@@ -1,39 +1,42 @@
 {
-    "name": "zf-commons/zfc-base",
-    "description": "A set of genetic (abstract) classes which are commonly used across multiple modules.",
-    "type": "library",
-    "keywords": [
-        "zf2"
-    ],
-    "homepage": "https://github.com/ZF-Commons/ZfcBase",
-    "authors": [
-        {
-            "name": "Evan Coury",
-            "email": "me@evancoury.com",
-            "homepage": "http://blog.evan.pro/"
-        },
-        {
-            "name": "Kyle Spraggs",
-            "email": "theman@spiffyjr.me",
-            "homepage": "http://www.spiffyjr.me/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "zendframework/zend-db": "~2.1",
-        "zendframework/zend-eventmanager": "~2.1",
-        "zendframework/zend-loader": "~2.1",
-        "zendframework/zend-modulemanager": "~2.1",
-        "zendframework/zend-mvc": "~2.1",
-        "zendframework/zend-servicemanager": "~2.1",
-        "zendframework/zend-stdlib": "~2.1"
+  "name": "zf-commons/zfc-base",
+  "description": "A set of genetic (abstract) classes which are commonly used across multiple modules.",
+  "type": "library",
+  "keywords": [
+    "zf2"
+  ],
+  "homepage": "https://github.com/ZF-Commons/ZfcBase",
+  "authors": [
+    {
+      "name": "Evan Coury",
+      "email": "me@evancoury.com",
+      "homepage": "http://blog.evan.pro/"
     },
-    "autoload": {
-        "psr-0": {
-            "ZfcBase": "src/"
-        },
-        "classmap": [
-            "./Module.php"
-        ]
+    {
+      "name": "Kyle Spraggs",
+      "email": "theman@spiffyjr.me",
+      "homepage": "http://www.spiffyjr.me/"
     }
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "zendframework/zend-component-installer": "^1.0 || ^0.3 || ^1.0.0-dev@dev",
+    "zendframework/zend-db": "~2.8",
+    "zendframework/zend-eventmanager": "^3.0",
+    "zendframework/zend-loader": "~2.5",
+    "zendframework/zend-modulemanager": "~2.7",
+    "zendframework/zend-form": "~2.9",
+    "zendframework/zend-mvc": "^3.0",
+    "zendframework/zend-servicemanager": "~3.1",
+    "zendframework/zend-stdlib": "~3.0"
+  },
+  "autoload": {
+    "psr-0": {
+      "ZfcBase": "src/",
+      "ZfcBaseTest": "test/"
+    },
+    "classmap": [
+      "./Module.php"
+    ]
+  }
 }
diff --git a/src/ZfcBase/Form/ProvidesEventsForm.php b/src/ZfcBase/Form/ProvidesEventsForm.php
index 17514ca..e51aa81 100644
--- a/src/ZfcBase/Form/ProvidesEventsForm.php
+++ b/src/ZfcBase/Form/ProvidesEventsForm.php
@@ -48,7 +48,9 @@ public function getEventManager()
                 }
                 // silently ignore invalid eventIdentifier types
             }
-            $this->setEventManager(new EventManager($identifiers));
+            $eventManager = new EventManager();
+            $eventManager->setIdentifiers($identifiers);
+            $this->setEventManager($eventManager);
         }
         return $this->events;
     }
diff --git a/test/Bootstrap.php b/test/Bootstrap.php
index 8c5443b..0d679ee 100644
--- a/test/Bootstrap.php
+++ b/test/Bootstrap.php
@@ -44,10 +44,18 @@ public static function init()
         );
 
         $config = ArrayUtils::merge($baseConfig, $testConfig);
+        $smConfig = isset($config['service_manager']) ? $config['service_manager'] : [];
+        $smConfig = new ServiceManagerConfig($smConfig);
 
-        $serviceManager = new ServiceManager(new ServiceManagerConfig());
+        $serviceManager = new ServiceManager();
+        $smConfig->configureServiceManager($serviceManager);
         $serviceManager->setService('ApplicationConfig', $config);
+
+        // Load modules
         $serviceManager->get('ModuleManager')->loadModules();
+
+
+
         static::$serviceManager = $serviceManager;
     }
 
diff --git a/test/TestConfig.php.dist b/test/TestConfig.php.dist
index 79f7d42..0f89259 100644
--- a/test/TestConfig.php.dist
+++ b/test/TestConfig.php.dist
@@ -3,6 +3,8 @@ define('ZF2_PATH', getenv('HOME') . '/workspace/zf2/library');
 
 return array(
     'modules' => array(
+        'Zend\Router',
+        'Zend\Form',
         'ZfcBase',
     ),
 );