diff --git a/puppetboard/forms.py b/puppetboard/forms.py
index 7628be0..72f0aba 100644
--- a/puppetboard/forms.py
+++ b/puppetboard/forms.py
@@ -1,14 +1,14 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 
-from flask.ext.wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import (
     HiddenField, RadioField, SelectField,
     TextAreaField, BooleanField, validators
 )
 
 
-class QueryForm(Form):
+class QueryForm(FlaskForm):
     """The form used to allow freeform queries to be executed against
     PuppetDB."""
     query = TextAreaField('Query', [validators.Required(
@@ -30,7 +30,7 @@ class QueryForm(Form):
     rawjson = BooleanField('Raw JSON')
 
 
-class CatalogForm(Form):
+class CatalogForm(FlaskForm):
     """The form used to compare the catalogs of different nodes."""
     compare = HiddenField('compare')
     against = SelectField('against')
diff --git a/test/test_form.py b/test/test_form.py
new file mode 100644
index 0000000..35286f5
--- /dev/null
+++ b/test/test_form.py
@@ -0,0 +1,12 @@
+import pytest
+from puppetboard import app, forms
+
+
+def test_form_valid(capsys):
+    for form in [forms.QueryForm, forms.CatalogForm]:
+        with app.app.test_request_context():
+            qf = form()
+            out, err = capsys.readouterr()
+            assert qf is not None
+            assert err == ""
+            assert out == ""