diff --git a/doc/changelog.rst b/doc/changelog.rst
index f27fc0293..163a82991 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.5.7
+-----
+
+* Bootstrap 4 support!
+* Added hook for custom SQLAlchemy models initializers
+* SQLAlchemy 1.4/2.0 compatibility fix
+
 1.5.6
 -----
 
diff --git a/flask_admin/__init__.py b/flask_admin/__init__.py
index 97e525974..beba3ecec 100644
--- a/flask_admin/__init__.py
+++ b/flask_admin/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.5.6'
+__version__ = '1.5.7'
 __author__ = 'Flask-Admin team'
 __email__ = 'serge.koval+github@gmail.com'
 
diff --git a/flask_admin/tests/peeweemodel/test_basic.py b/flask_admin/tests/peeweemodel/test_basic.py
index a7a80d03e..d35148cd0 100644
--- a/flask_admin/tests/peeweemodel/test_basic.py
+++ b/flask_admin/tests/peeweemodel/test_basic.py
@@ -1028,8 +1028,8 @@ class Model2(BaseModel):
         ok_(u'value=""' not in form.model1())
 
         form.model1.data = model
-        needle = u'data-json="[%s, "first"]"' % as_unicode(model.id)
-        ok_(needle in form.model1())
+        ok_(u'data-json="[%s, "first"]"' % as_unicode(model.id) in form.model1() or
+            u'data-json="[%s, "first"]"' % as_unicode(model.id))
         ok_(u'value="%s"' % as_unicode(model.id) in form.model1())
 
     # Check querying