diff --git a/tests/storage/test_http_with_singlefile.py b/tests/storage/test_http_with_singlefile.py
new file mode 100644
index 0000000..631bdc8
--- /dev/null
+++ b/tests/storage/test_http_with_singlefile.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+'''
+    tests.storage.test_http_with_singlefile
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: (c) 2014 Markus Unterwaditzer & contributors
+    :license: MIT, see LICENSE for more details.
+'''
+
+import pytest
+
+from requests import Response
+
+from vdirsyncer.storage.base import Storage
+import vdirsyncer.storage.http
+from vdirsyncer.storage.singlefile import SingleFileStorage
+
+from . import BaseStorageTests
+from .. import EVENT_TEMPLATE, assert_item_equals
+
+
+class CombinedStorage(Storage):
+    '''A subclass of HttpStorage to make testing easier. It supports writes via
+    SingleFileStorage.'''
+    _repr_attributes = ('url', 'path')
+
+    def __init__(self, url, path, **kwargs):
+        super(CombinedStorage, self).__init__(**kwargs)
+        self.url = url
+        self.path = path
+        self._reader = vdirsyncer.storage.http.HttpStorage(url=url)
+        self._writer = SingleFileStorage(path=path)
+
+    def list(self, *a, **kw):
+        return self._reader.list(*a, **kw)
+
+    def get(self, *a, **kw):
+        self.list()
+        return self._reader.get(*a, **kw)
+
+    def upload(self, *a, **kw):
+        return self._writer.upload(*a, **kw)
+
+    def update(self, *a, **kw):
+        return self._writer.update(*a, **kw)
+
+    def delete(self, *a, **kw):
+        return self._writer.delete(*a, **kw)
+
+
+class TestHttpStorage(BaseStorageTests):
+    storage_class = CombinedStorage
+    item_template = EVENT_TEMPLATE
+
+    @pytest.fixture(autouse=True)
+    def setup_tmpdir(self, tmpdir, monkeypatch):
+        self.tmpfile = str(tmpdir.join('collection.txt'))
+
+        def _request(method, url, *args, **kwargs):
+            assert method == 'GET'
+            assert url == 'http://localhost:123/collection.txt'
+            r = Response()
+            r.status_code = 200
+            try:
+                with open(self.tmpfile, 'rb') as f:
+                    r._content = f.read()
+            except IOError:
+                r._content = b''
+
+            r.headers['Content-Type'] = 'text/icalendar'
+            r.encoding = 'ISO-8859-1'
+            return r
+
+        monkeypatch.setattr(vdirsyncer.storage.http, 'request', _request)
+
+    def get_storage_args(self, collection=None):
+        assert collection is None
+        return {'url': 'http://localhost:123/collection.txt',
+                'path': self.tmpfile}
+
+    def test_update(self):
+        '''The original testcase tries to fetch with the old href. But this
+        storage doesn't have real hrefs, so the href might change if the
+        underlying UID changes. '''
+
+        s = self._get_storage()
+        item = self._create_bogus_item()
+        href, etag = s.upload(item)
+        assert_item_equals(s.get(href)[0], item)
+
+        new_item = self._create_bogus_item()
+        s.update(href, new_item, etag)
+        ((new_href, new_etag),) = s.list()
+        assert_item_equals(s.get(new_href)[0], new_item)