diff --git a/.travis.yml b/.travis.yml
index a3142da..e2cea2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,12 @@ matrix:
           env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release
         - python: 2.7
           env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal
+        - python: 2.7
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=devel
+        - python: 2.7
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=release
+        - python: 2.7
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal
         - python: 3.3
           env: BUILD=style
         - python: 3.3
@@ -62,6 +68,12 @@ matrix:
           env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=release
         - python: 3.5
           env: BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal
+        - python: 3.5
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=devel
+        - python: 3.5
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=release
+        - python: 3.5
+          env: BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal
         - python: pypy
           env: BUILD=style
         - python: pypy
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 3b6f30e..d7a6624 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -40,7 +40,7 @@ with section("matrix"):
             p("  env: BUILD=style")
 
             if python in ("2.7", "3.5"):
-                dav_servers = ("radicale", "owncloud", "baikal")
+                dav_servers = ("radicale", "owncloud", "baikal", "davical")
             else:
                 dav_servers = ("radicale",)
 
diff --git a/vdirsyncer/utils/compat.py b/vdirsyncer/utils/compat.py
index 1e499e0..f4c5d4d 100644
--- a/vdirsyncer/utils/compat.py
+++ b/vdirsyncer/utils/compat.py
@@ -27,7 +27,7 @@ def _wrap_native(f, encoding='utf-8'):
     @functools.wraps(f)
     def wrapper(x, *a, **kw):
         to_orig = to_unicode if isinstance(x, text_type) else to_bytes
-        return to_orig(f(to_native(x, encoding), *a, **kw))
+        return to_orig(f(to_native(x, encoding), *a, **kw), encoding)
     return wrapper