diff --git a/tests/test_find.py b/tests/test_find.py
index 161666499..c71bed3f4 100644
--- a/tests/test_find.py
+++ b/tests/test_find.py
@@ -101,9 +101,9 @@ def test_findCards():
     deck.conf['sortBackwards'] = True
     assert deck.findCards("")[0] in latestCardIds
     # model
-    assert len(deck.findCards("model:basic")) == 5
-    assert len(deck.findCards("-model:basic")) == 0
-    assert len(deck.findCards("-model:foo")) == 5
+    assert len(deck.findCards("ntype:basic")) == 5
+    assert len(deck.findCards("-ntype:basic")) == 0
+    assert len(deck.findCards("-ntype:foo")) == 5
     # deck
     assert len(deck.findCards("deck:default")) == 5
     assert len(deck.findCards("-deck:default")) == 0
diff --git a/tests/test_upgrade.py b/tests/test_upgrade.py
index 466c64c1d..c610d0107 100644
--- a/tests/test_upgrade.py
+++ b/tests/test_upgrade.py
@@ -47,7 +47,7 @@ def test_upgrade1_due():
     dst = getUpgradeDeckPath("anki12-due.anki")
     u = Upgrader()
     deck = u.upgrade(dst)
-    print deck.db.all("select nid, due from cards")
+    assert not deck.db.scalar("select 1 from cards where due != 1")
 
 def test_upgrade2():
     p = "/tmp/alpha-upgrade.anki2"