diff --git a/atst/domain/date.py b/atst/domain/date.py
new file mode 100644
index 00000000..4a131671
--- /dev/null
+++ b/atst/domain/date.py
@@ -0,0 +1,12 @@
+import pendulum
+
+
+def parse_date(data):
+    date_formats = ["YYYY-MM-DD", "MM/DD/YYYY"]
+    for _format in date_formats:
+        try:
+            return pendulum.from_format(data, _format).date()
+        except (ValueError, pendulum.parsing.exceptions.ParserError):
+            pass
+
+    raise ValueError("Unable to parse string {}".format(data))
diff --git a/atst/forms/fields.py b/atst/forms/fields.py
index 00e53529..2c06154a 100644
--- a/atst/forms/fields.py
+++ b/atst/forms/fields.py
@@ -1,20 +1,14 @@
 from wtforms.fields.html5 import DateField
 from wtforms.fields import Field
 from wtforms.widgets import TextArea
-import pendulum
+
+from atst.domain.date import parse_date
 
 
 class DateField(DateField):
     def _value(self):
         if self.data:
-            date_formats = ["YYYY-MM-DD", "MM/DD/YYYY"]
-            for _format in date_formats:
-                try:
-                    return pendulum.from_format(self.data, _format).date()
-                except (ValueError, pendulum.parsing.exceptions.ParserError):
-                    pass
-
-            raise ValueError("Unable to parse string {}".format(self.data))
+            return parse_date(self.data)
         else:
             return None
 
diff --git a/atst/forms/validators.py b/atst/forms/validators.py
index 3937dabb..241a5401 100644
--- a/atst/forms/validators.py
+++ b/atst/forms/validators.py
@@ -2,18 +2,19 @@ import re
 from wtforms.validators import ValidationError
 import pendulum
 
+from atst.domain.date import parse_date
+
 
 def DateRange(lower_bound=None, upper_bound=None, message=None):
     def _date_range(form, field):
         now = pendulum.now().date()
+        date = parse_date(field.data)
 
         if lower_bound is not None:
-            date = pendulum.parse(field.data).date()
             if (now - lower_bound) > date:
                 raise ValidationError(message)
 
         if upper_bound is not None:
-            date = pendulum.parse(field.data).date()
             if (now + upper_bound) < date:
                 raise ValidationError(message)
 
diff --git a/tests/domain/test_date.py b/tests/domain/test_date.py
new file mode 100644
index 00000000..fe80530d
--- /dev/null
+++ b/tests/domain/test_date.py
@@ -0,0 +1,21 @@
+import pytest
+import pendulum
+
+from atst.domain.date import parse_date
+
+
+def test_date_with_slashes():
+    date_str = "1/2/2020"
+    assert parse_date(date_str) == pendulum.date(2020, 1, 2)
+
+
+def test_date_with_dashes():
+    date_str = "2020-1-2"
+    assert parse_date(date_str) == pendulum.date(2020, 1, 2)
+
+
+def test_invalid_date():
+    date_str = "This is not a valid data"
+    with pytest.raises(ValueError):
+        parse_date(date_str)
+