diff --git a/lib/ember-orbit/record-arrays/record-array.js b/lib/ember-orbit/record-arrays/record-array.js
index 146c7322..e564a747 100644
--- a/lib/ember-orbit/record-arrays/record-array.js
+++ b/lib/ember-orbit/record-arrays/record-array.js
@@ -4,8 +4,6 @@
 
 var get = Ember.get;
 
-var forEach = Ember.EnumerableUtils.forEach;
-
 /**
  @class RecordArray
  @namespace EO
@@ -71,13 +69,13 @@ var RecordArray = Ember.ArrayProxy.extend(Ember.Evented, {
   },
 
   _recordsAdded: function(records) {
-    forEach(records, function(record) {
+    records.forEach(function(record) {
       this._recordAdded(record);
     }, this);
   },
 
   _recordsRemoved: function(records) {
-    forEach(records, function(record) {
+    records.forEach(function(record) {
       this._recordRemoved(record);
     }, this);
   },
diff --git a/lib/ember-orbit/schema.js b/lib/ember-orbit/schema.js
index 2a3e6dba..b261b390 100644
--- a/lib/ember-orbit/schema.js
+++ b/lib/ember-orbit/schema.js
@@ -86,7 +86,7 @@ var Schema = Ember.Object.extend({
 
     var model = this._modelTypeMap[type];
     if (!model) {
-      model = this.container.lookupFactory('model:' + type);
+      model = get(this, 'container').lookupFactory('model:' + type);
       if (!model) {
         throw new Ember.Error("No model was found for '" + type + "'");
       }
diff --git a/test/tests/test-helper.js b/test/tests/test-helper.js
index 25b92dd3..c0598b51 100644
--- a/test/tests/test-helper.js
+++ b/test/tests/test-helper.js
@@ -4,14 +4,15 @@ import Store from 'ember-orbit/store';
 var createStore = function(options) {
   options = options || {};
 
-  var container = new Ember.Container();
-  container._registry.register('schema:main', Schema);
-  container._registry.register('store:main', Store);
+  var registry = new Ember.Registry();
+  var container = registry.container();
+  registry.register('schema:main', Schema);
+  registry.register('store:main', Store);
 
   var models = options.models;
   if (models) {
     for (var prop in models) {
-      container.register('model:' + prop, models[prop]);
+      registry.register('model:' + prop, models[prop]);
     }
   }
 
diff --git a/test/tests/unit/schema-test.js b/test/tests/unit/schema-test.js
index b9de4b90..f0b9deb5 100644
--- a/test/tests/unit/schema-test.js
+++ b/test/tests/unit/schema-test.js
@@ -93,9 +93,10 @@ test("#defineModel defines models on the underlying Orbit schema", function() {
 test("#modelFor returns the appropriate model when passed a model's name", function() {
   var Planet = Model.extend();
 
-  var container = new Ember.Container();
-  container.register('schema:main', Schema);
-  container.register('model:planet', Planet);
+  var registry = new Ember.Registry();
+  var container = registry.container();
+  registry.register('schema:main', Schema);
+  registry.register('model:planet', Planet);
 
   set(schema, 'container', container);
 
@@ -124,11 +125,12 @@ test("#modelFor ensures that related models are also registered in the schema",
     moons: hasMany('moon')
   });
 
-  var container = new Ember.Container();
-  container.register('schema:main', Schema);
-  container.register('model:planet', Planet);
-  container.register('model:star', Star);
-  container.register('model:moon', Moon);
+  var registry = new Ember.Registry();
+  var container = registry.container();
+  registry.register('schema:main', Schema);
+  registry.register('model:planet', Planet);
+  registry.register('model:star', Star);
+  registry.register('model:moon', Moon);
 
   set(schema, 'container', container);
 
diff --git a/test/tests/unit/source-test.js b/test/tests/unit/source-test.js
index 1630e66a..1ca2a132 100644
--- a/test/tests/unit/source-test.js
+++ b/test/tests/unit/source-test.js
@@ -9,7 +9,7 @@ var source;
 module("Unit - Source", {
   setup: function() {
     Orbit.Promise = Ember.RSVP.Promise;
-    
+
     source = Source.create({
       schema: Schema.create(),
       orbitSourceClass: OCMemorySource
@@ -35,7 +35,7 @@ test("it can specify a custom `orbitSourceClass` and `orbitSourceOptions`", func
   });
 
   var customSource = CustomSource.create({
-    container: new Ember.Container(),
+    container: new Ember.Registry().container(),
     schema: Schema.create()
   });
 
diff --git a/test/tests/unit/store-test.js b/test/tests/unit/store-test.js
index ec21960c..6067b6c5 100644
--- a/test/tests/unit/store-test.js
+++ b/test/tests/unit/store-test.js
@@ -72,7 +72,7 @@ test("it can specify a custom `orbitSourceClass` and `orbitSourceOptions`", func
   });
 
   var customStore = CustomStore.create({
-    container: new Ember.Container(),
+    container: new Ember.Registry().container(),
     schema: Schema.create()
   });
 
@@ -88,8 +88,9 @@ test("it uses a schema that's been specified", function() {
 });
 
 test("it creates a schema if none has been specified", function() {
-  var container = new Ember.Container();
-  container.register('schema:main', Schema);
+  var registry = new Ember.Registry();
+  var container = registry.container();
+  registry.register('schema:main', Schema);
 
   var store2 = Store.create({container: container});
   var schema2 = get(store2, 'schema');