diff --git a/app.yaml b/app.yaml
index feca2bed1afe..907c57fbff52 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,7 +1,5 @@
 # dummy app.yaml for nosegae
 
-application: python-docs-samples
-version: 1
 api_version: 1
 runtime: python27
 threadsafe: true
diff --git a/datastore/ndb/modeling/tests/test_contact_with_group_models.py b/datastore/ndb/modeling/tests/test_contact_with_group_models.py
index 57c4417895c2..68a4984ca923 100644
--- a/datastore/ndb/modeling/tests/test_contact_with_group_models.py
+++ b/datastore/ndb/modeling/tests/test_contact_with_group_models.py
@@ -17,12 +17,12 @@
 
 import unittest
 
+from datastore.ndb.modeling import contact_with_group_models as models
+
 from google.appengine.ext import ndb
 
 import test_base
 
-from .. import contact_with_group_models as models
-
 
 class ContactTestCase(test_base.TestCase):
     """A test case for the Contact model with groups."""
diff --git a/datastore/ndb/modeling/tests/test_keyproperty_models.py b/datastore/ndb/modeling/tests/test_keyproperty_models.py
index 57c031beeff9..781131897513 100644
--- a/datastore/ndb/modeling/tests/test_keyproperty_models.py
+++ b/datastore/ndb/modeling/tests/test_keyproperty_models.py
@@ -17,9 +17,9 @@
 
 import unittest
 
-import test_base
+from datastore.ndb.modeling import keyproperty_models as models
 
-from .. import keyproperty_models as models
+import test_base
 
 
 class ContactTestCase(test_base.TestCase):
diff --git a/datastore/ndb/modeling/tests/test_naive_models.py b/datastore/ndb/modeling/tests/test_naive_models.py
index 0a954dd4f20f..e6fb51aa739a 100644
--- a/datastore/ndb/modeling/tests/test_naive_models.py
+++ b/datastore/ndb/modeling/tests/test_naive_models.py
@@ -17,9 +17,9 @@
 
 import unittest
 
-import test_base
+from datastore.ndb.modeling import naive_models as models
 
-from .. import naive_models as models
+import test_base
 
 
 class ContactTestCase(test_base.TestCase):
diff --git a/datastore/ndb/modeling/tests/test_parent_child_models.py b/datastore/ndb/modeling/tests/test_parent_child_models.py
index d6d2ad2e7a55..4f7b8864d1de 100644
--- a/datastore/ndb/modeling/tests/test_parent_child_models.py
+++ b/datastore/ndb/modeling/tests/test_parent_child_models.py
@@ -17,12 +17,12 @@
 
 import unittest
 
+from datastore.ndb.modeling import parent_child_models as models
+
 from google.appengine.ext import ndb
 
 import test_base
 
-from .. import parent_child_models as models
-
 
 class ContactTestCase(test_base.TestCase):
     """A test case for the Contact model class with KeyProperty."""
diff --git a/datastore/ndb/modeling/tests/test_relation_model_models.py b/datastore/ndb/modeling/tests/test_relation_model_models.py
index aa93b6cb32f3..8990dae61969 100644
--- a/datastore/ndb/modeling/tests/test_relation_model_models.py
+++ b/datastore/ndb/modeling/tests/test_relation_model_models.py
@@ -17,12 +17,12 @@
 
 import unittest
 
+from datastore.ndb.modeling import relation_model_models as models
+
 from google.appengine.ext import ndb
 
 import test_base
 
-from .. import relation_model_models as models
-
 
 class ContactTestCase(test_base.TestCase):
     """A test case for the Contact model with relationship model."""
diff --git a/datastore/ndb/modeling/tests/test_structured_property_models.py b/datastore/ndb/modeling/tests/test_structured_property_models.py
index 348b700c6dd0..8af106894d03 100644
--- a/datastore/ndb/modeling/tests/test_structured_property_models.py
+++ b/datastore/ndb/modeling/tests/test_structured_property_models.py
@@ -17,9 +17,9 @@
 
 import unittest
 
-import test_base
+from datastore.ndb.modeling import structured_property_models as models
 
-from .. import structured_property_models as models
+import test_base
 
 
 class ContactTestCase(test_base.TestCase):