diff --git a/tests/all-kinds-of-errors.py b/tests/all-kinds-of-errors.py
new file mode 100644
index 0000000..50440ed
--- /dev/null
+++ b/tests/all-kinds-of-errors.py
@@ -0,0 +1,17 @@
+import random
+
+def invalid_header_type(environ, start_response):
+    start_response('200 ok', None)
+    return ['yo']
+
+def invalid_header_tuple(environ, start_response):
+    tuples = {1: (), 2: ('a', 'b', 'c'), 3: ('a',)}
+    start_response('200 ok', [tuples[random.randint(1, 3)]])
+    return ['yo']
+
+def invalid_header_tuple_item(environ, start_response):
+    start_response('200 ok', (object(), object()))
+    return ['yo']
+
+import bjoern
+bjoern.run(invalid_header_type, '0.0.0.0', 8080)
diff --git a/tests/empty.py b/tests/empty.py
new file mode 100644
index 0000000..ef91dfa
--- /dev/null
+++ b/tests/empty.py
@@ -0,0 +1,6 @@
+def app(e, s):
+    s('200 ok', [])
+    return ''
+
+import bjoern
+bjoern.run(app, '0.0.0.0', 8080)
diff --git a/tests/file.py b/tests/file.py
new file mode 100644
index 0000000..2f8142f
--- /dev/null
+++ b/tests/file.py
@@ -0,0 +1,21 @@
+import os
+
+FILES = {
+    'small' : 888,
+    'big' : 88888
+}
+
+for name, size in FILES.items():
+    new_name = '/tmp/bjoern.%s.tmp' % name
+    with open(new_name, 'w') as f:
+        f.write(os.urandom(size))
+    FILES[name] = new_name
+
+def app(env, start_response):
+    start_response('200 ok', [])
+    if env['PATH_INFO'].startswith('/big'):
+        return open(FILES['big'])
+    return open(FILES['small'])
+
+import bjoern
+bjoern.run(app, '0.0.0.0', 8080)
diff --git a/tests/headers.py b/tests/headers.py
new file mode 100644
index 0000000..ba8c8dc
--- /dev/null
+++ b/tests/headers.py
@@ -0,0 +1,9 @@
+import pprint
+import bjoern
+
+def app(env, start_response):
+    pprint.pprint(env)
+    start_response('200 yo', [])
+    return []
+
+bjoern.run(app, '0.0.0.0', 8080)
diff --git a/tests/huge.py b/tests/huge.py
new file mode 100644
index 0000000..c72ee4f
--- /dev/null
+++ b/tests/huge.py
@@ -0,0 +1,15 @@
+N = 1024
+CHUNK = 'a' * 1024
+DATA_LEN = N * len(CHUNK)
+
+class _iter(object):
+    def __iter__(self):
+        for i in xrange(N):
+            yield CHUNK
+
+def app(e, s):
+    s('200 ok', [('Content-Length', str(DATA_LEN))])
+    return _iter()
+
+import bjoern
+bjoern.run(app, '0.0.0.0', 8080)
diff --git a/tests/keep-alive-behaviour.py b/tests/keep-alive-behaviour.py
new file mode 100644
index 0000000..cd43d91
--- /dev/null
+++ b/tests/keep-alive-behaviour.py
@@ -0,0 +1,151 @@
+import os
+import re
+import random
+import httplib
+import socket
+
+HOST = ('127.0.0.1', 9000)
+
+class Fail(Exception):
+    pass
+
+def dispatcher(environ, start_response):
+    return dispatcher.app(environ, start_response)
+
+def still_alive(sock):
+    prev_timeout = sock.gettimeout()
+    try:
+        sock.settimeout(0.5)
+        try:
+            c = sock.recv(100)
+            assert not c, repr(c)
+            return False
+        except socket.timeout:
+            return True
+    finally:
+        sock.settimeout(prev_timeout)
+
+
+class NeverClosedHTTPConnection(httplib.HTTPConnection):
+    def close(self):
+        backup = self.sock
+        self.sock = None
+        httplib.HTTPConnection.close(self)
+        self.sock = backup
+
+class Testcase(object):
+    body_length = 1000
+
+    def __init__(self):
+        self.conn = None
+        self.body = os.urandom(self.body_length)
+        self.request_count = 5
+
+    def run(self):
+        if not self.conn:
+            dispatcher.app = self
+            self.conn = NeverClosedHTTPConnection(*HOST)
+
+        self.send_request(self._tinker_request())
+        response = self.get_response()
+        if self.expect_chunked and not response.chunked:
+            raise Fail("Response unexpectedly not chunked")
+        body = response.read()
+
+        if self.raise_error:
+            if response.status != 500 or body:
+                raise Fail("Expected 500 Internal Server Error")
+        else:
+            if response.status != 200:
+                raise Fail("Status is %d, expected 200", response.status)
+
+        if still_alive(self.conn.sock):
+            if not self.expect_keep_alive:
+                raise Fail("Expected connection not be kept-alive")
+            self.request_count -= 1
+            if self.request_count:
+                if self.request_count == 1:
+                    # Send Connection: close on last request
+                    self.want_keep_alive = False
+                    self.expect_keep_alive = False
+                    self.expect_chunked = False
+                self.run()
+            else:
+                if still_alive(self.conn.sock):
+                    raise Fail("Connection still alive")
+        else:
+            if self.expect_keep_alive:
+                raise Fail("Expected connection to be kept-alive")
+
+        if not self.raise_error and body != self.body:
+            raise Fail("Different bodies:\n%s\n%s" % (body, self.body))
+
+    def _is_chunked(self, response):
+        if not 'Transfer-Encoding: chunked' in response or not response.endswith('0\r\n\r\n'):
+            return False
+        # TODO: full-featured chunked validation here
+        return True
+
+    def _tinker_request(self):
+        req = 'GET / HTTP/1.%d\r\n' % self.http_minor
+        if self.want_keep_alive:
+            req += 'Connection: Keep-Alive\r\n'
+        req += '\r\n'
+        return req
+
+    def send_request(self, data):
+        self.conn.send(data)
+
+    def get_response(self):
+        self.conn._HTTPConnection__state = httplib._CS_REQ_SENT
+        return self.conn.getresponse()
+
+    def __call__(self, environ, start_response):
+        if self.raise_error and random.randint(0, 1):
+            raise ValueError('foo')
+        headers = []
+        if self.give_content_length:
+            headers.append(('Content-Length', str(len(self.body))))
+        if self.raise_error:
+            start_response('200 ok', headers)
+            raise ValueError('bar')
+        start_response('200 ok', headers)
+        # second item is to trick bjoern's internal optimizations:
+        return [self.body, '']
+
+import thread
+import bjoern
+thread.start_new_thread(bjoern.run, (dispatcher,)+HOST)
+
+import time; time.sleep(0.1)
+
+for index, tpl in enumerate([
+        (0, False,  False, False, False, False),
+        (0, False,  False, True,  False, False),
+        (0, False,  False, True,  False, False),
+        (0, False,  True,  True,  False, True),
+        (0, True,   False, False, False, False),
+        (0, True,   False, True,  False, False),
+        (0, True,   True,  False, False, False),
+        (0, True,   True,  True,  False, False),
+
+        (1, False,  False, False, False, False),
+        (1, False,  False, True,  True,  True),
+        (1, False,  True,  False, False, False),
+        (1, False,  True,  True,  False, True),
+        (1, True,   False, False, False, False),
+        (1, True,   False, True,  False, False),
+        (1, True,   True,  False, False, False),
+        (1, True,   True,  True,  False, False)
+]):
+    print 'Running test %d: %r' % (index, tpl)
+    class _test(Testcase):
+        http_minor, \
+        raise_error, \
+        give_content_length, \
+        want_keep_alive, \
+        expect_chunked, \
+        expect_keep_alive = tpl
+    _test().run()
+
+print '--- SUCCESS! ---'
diff --git a/tests/pure-req.py b/tests/pure-req.py
new file mode 100644
index 0000000..e87513b
--- /dev/null
+++ b/tests/pure-req.py
@@ -0,0 +1,29 @@
+import sys
+import socket
+
+conn = socket.create_connection(('0.0.0.0', 8080))
+msgs = [
+    # Keep-Alive, Transfer-Encoding chunked
+    'GET / HTTP/1.1\r\nConnection: Keep-Alive\r\n\r\n',
+    # Close, EOF "encoding"
+    'GET / HTTP/1.1\r\n\r\n',
+    'GET / HTTP/1.1\r\nConnection: close\r\n\r\n',
+    'GET / HTTP/1.0\r\nConnection: Keep-Alive\r\n\r\n',
+    # Bad Request
+    'GET /%20%20% HTTP/1.1\r\n\r\n',
+    # Bug #14
+    'GET /%20abc HTTP/1.0\r\n\r\n',
+    # Content-{Length, Type}
+    'GET / HTTP/1.0\r\nContent-Length: 11\r\n'
+    'Content-Type: text/blah\r\nContent-Fype: bla\r\n'
+    'Content-Tength: bla\r\n\r\nhello world'
+]
+conn.send(msgs[int(sys.argv[1])])
+while 1:
+    data = conn.recv(100)
+    if not data: break
+    print repr(data)
+    if data.endswith('0\r\n\r\n'):
+        if raw_input('new request? Y/n') == 'n':
+            exit()
+        conn.send('GET / HTTP/1.1\r\nConnection: Keep-Alive\r\n\r\n')