diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ac9f1d2..63cc773 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Version 0.16.0
 ==============
 
 - Strip ``METHOD:PUBLISH`` added by some calendar providers.
+- Fix crash of Google storages when saving token file.
 
 Version 0.15.0
 ==============
diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py
index 951b68f..fab681a 100644
--- a/vdirsyncer/storage/google.py
+++ b/vdirsyncer/storage/google.py
@@ -59,7 +59,7 @@ class GoogleSession(dav.DAVSession):
             )
 
         def _save_token(token):
-            checkdir(os.path.dirname(token_file), create=True)
+            checkdir(expand_path(os.path.dirname(token_file)), create=True)
             with atomic_write(token_file, mode='w', overwrite=True) as f:
                 json.dump(token, f)