diff --git a/appengine/standard/ndb/queries/snippets.py b/appengine/standard/ndb/queries/snippets.py
index 01ee186d575..673d3f769c5 100644
--- a/appengine/standard/ndb/queries/snippets.py
+++ b/appengine/standard/ndb/queries/snippets.py
@@ -14,7 +14,8 @@
 
 from google.appengine.ext import ndb
 from guestbook import Greeting
-from snippets_models import *  # noqa
+from snippets_models import (Account, Address, Article,
+                             Bar, Contact, Employee, FlexEmployee, Manager)
 
 
 def query_account_equality():
diff --git a/appengine/standard/ndb/queries/snippets_test.py b/appengine/standard/ndb/queries/snippets_test.py
index 21fdde9f134..c53d48cde3b 100644
--- a/appengine/standard/ndb/queries/snippets_test.py
+++ b/appengine/standard/ndb/queries/snippets_test.py
@@ -14,7 +14,8 @@
 
 from guestbook import Greeting
 import snippets
-from snippets_models import *  # noqa
+from snippets_models import (Account, Address, Article,
+                             Bar, Contact, FlexEmployee, Message)
 
 
 def test_query_account_equality(testbed):