diff --git a/.travis.yml b/.travis.yml
index eec9daa..703a345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "3.5"
   - "3.6"
 env:
-  - PEEWEE_VERSION=3.0.19
+  - PEEWEE_VERSION=3.0.20
   - PEEWEE_VERSION=3.1.7
   - PEEWEE_VERSION=3.2.5
   - PEEWEE_VERSION=3.3.4
diff --git a/peewee_moves.py b/peewee_moves.py
index 88b2db3..b560ddd 100644
--- a/peewee_moves.py
+++ b/peewee_moves.py
@@ -52,9 +52,12 @@
     peewee.TimeField: 'time',
     peewee.TimestampField: 'timestamp',
     peewee.UUIDField: 'uuid',
-    peewee.BinaryUUIDField: 'bin_uuid',
 }
 
+# Only available on peewee >= 3.3.4
+if hasattr(peewee, 'BinaryUUIDField'):
+    PEEWEE_TO_FIELD[peewee.BinaryUUIDField] = 'bin_uuid'
+
 FIELD_TO_PEEWEE = {value: key for key, value in PEEWEE_TO_FIELD.items()}
 FIELD_TO_PEEWEE['integer'] = peewee.IntegerField
 FIELD_TO_PEEWEE['smallinteger'] = peewee.SmallIntegerField
diff --git a/tests/test_migrator.py b/tests/test_migrator.py
index 0587465..4f099b4 100644
--- a/tests/test_migrator.py
+++ b/tests/test_migrator.py
@@ -31,7 +31,7 @@ def test_create_table(tmpdir):
         table.bin_uuid('col_bin_uuid')
         table.add_index(('col_char', 'col_integer'), unique=True)
 
-    assert manager.database.table_exists('awesome')
+    assert 'awesome' in manager.database.get_tables()
 
 
 def test_drop_table(tmpdir):
@@ -41,7 +41,7 @@ def test_drop_table(tmpdir):
         table.primary_key('id')
 
     manager.migrator.drop_table('awesome')
-    assert not manager.database.table_exists('awesome')
+    assert 'awesome' not in manager.database.get_tables()
 
 
 def test_add_drop_column(tmpdir):
@@ -133,5 +133,5 @@ def test_foreign_key(tmpdir):
         table.primary_key('id')
         table.foreign_key('char', 'basic', 'basic.username')
 
-    assert manager.database.table_exists('basic')
-    assert manager.database.table_exists('related1')
+    assert 'basic' in manager.database.get_tables()
+    assert 'related1' in manager.database.get_tables()