diff --git a/tests/default/cgi/set.cgi b/tests/default/cgi/set.cgi
new file mode 100755
index 0000000..1ee8b96
--- /dev/null
+++ b/tests/default/cgi/set.cgi
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+echo Content-Type: text/plain
+echo
+set | sort | grep 'GATEWAY\|SERVER\|REQUEST\|SCRIPT\|REMOTE\|HTTP\|AUTH\|CONTENT\|QUERY\|PATH_'
+if [ -n "$CONTENT_TYPE" ]; then
+    echo -n "Form data: "
+    dd bs=1 count=$CONTENT_LENGTH 2>/dev/null
+fi
diff --git a/tests/moo:80/.empty b/tests/empty:80/.empty
similarity index 100%
rename from tests/moo:80/.empty
rename to tests/empty:80/.empty
diff --git a/tests/test.py b/tests/test.py
index 0a6c836..f867fb9 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -15,7 +15,7 @@ class ArgTests(unittest.TestCase):
     def check_index(self, *args):
         p = fnord(*args)
         so, se = p.communicate(b'GET / HTTP/1.0\r\n\r\n')
-        self.assertEqual(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nContent-Type: text/html; charset=UTF-8\r\nContent-Length: 6\r\nLast-Modified: Thu, 16 Feb 2012 04:08:57 GMT\r\n\r\njames\n')
+        self.assertRegex(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nContent-Type: text/html; charset=UTF-8\r\nContent-Length: 6\r\nLast-Modified: (Mon|Tue|Wed|Thu|Fri|Sat|Sun), .. (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) 2... ..:..:.. GMT\r\n\r\njames\n')
         self.assertEqual(se, b'10.1.2.3 200 6 127.0.0.1:80 (null) (null) /index.html\n')
 
     def testArgs(self):
@@ -46,14 +46,47 @@ class BasicTests(unittest.TestCase):
         so, se = self.p.communicate(h.encode('utf-8'))
         return (so, se)
 
+    def post(self, path, host, formdata):
+        h = 'POST %s HTTP/1.0\r\nHost: %s\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: %d\r\n\r\n%s' % (path, host, len(formdata), formdata)
+        so, se = self.p.communicate(h.encode('utf-8'))
+        return (so, se)
 
 class DirTests(BasicTests):
     args = ['-d']
 
     def testRootDir(self):
-        so, se = self.get('/', 'moo')
+        so, se = self.get('/', 'empty')
         self.assertEqual(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nConnection: close\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<h3>Directory Listing: /</h3>\n<pre>\n</pre>\n')
-        self.assertEqual(se, b'10.1.2.3 200 32 moo:80 (null) (null) /\n')
+        self.assertEqual(se, b'10.1.2.3 200 32 empty:80 (null) (null) /\n')
 
+    def testNoTrailingSlash(self):
+        so, se = self.get('/files', 'default')
+        self.assertEqual(so, b'HTTP/1.0 404 Not Found\r\nConnection: close\r\nContent-Length: 50\r\nContent-Type: text/html\r\n\r\n<title>Not Found</title>No such file or directory.')
+        self.assertEqual(se, b'10.1.2.3 404 0 default:80 (null) (null) /files\n')
+
+    def testFiles(self):
+        so, se = self.get('/files/', 'default')
+
+        self.assertEqual(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nConnection: close\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<h3>Directory Listing: /files/</h3>\n<pre>\n<a href="/">Parent directory</a>\n</pre>\n')
+        self.assertEqual(se, b'10.1.2.3 200 78 default:80 (null) (null) /files/\n')
+
+
+class CGITests(BasicTests):
+    args = ['-c']
+
+    def testSet(self):
+        so, se = self.get('/cgi/set.cgi', 'default')
+        self.assertEqual(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nPragma: no-cache\r\nConnection: close\r\nContent-Type: text/plain\r\n\nGATEWAY_INTERFACE=CGI/1.1\nREMOTE_ADDR=10.1.2.3\nREMOTE_PORT=5858\nREQUEST_METHOD=GET\nREQUEST_URI=/cgi/set.cgi\nSCRIPT_NAME=/cgi/set.cgi\nSERVER_NAME=default:80\nSERVER_PORT=80\nSERVER_PROTOCOL=HTTP/1.0\nSERVER_SOFTWARE=fnord/2.0\n')
+        self.assertEqual(se, b'10.1.2.3 200 248 default:80 (null) (null) /cgi/set.cgi\n')
+
+    def testSetArgs(self):
+        so, se = self.get('/cgi/set.cgi?a=1&b=2&c=3', 'default')
+        self.assertEqual(so, b"HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nPragma: no-cache\r\nConnection: close\r\nContent-Type: text/plain\r\n\nGATEWAY_INTERFACE=CGI/1.1\nQUERY_STRING='a=1&b=2&c=3'\nREMOTE_ADDR=10.1.2.3\nREMOTE_PORT=5858\nREQUEST_METHOD=GET\nREQUEST_URI=/cgi/set.cgi\nSCRIPT_NAME=/cgi/set.cgi\nSERVER_NAME=default:80\nSERVER_PORT=80\nSERVER_PROTOCOL=HTTP/1.0\nSERVER_SOFTWARE=fnord/2.0\n")
+        self.assertEqual(se, b'10.1.2.3 200 275 default:80 (null) (null) /cgi/set.cgi\n')
+
+    def testPost(self):
+        so, se = self.post('/cgi/set.cgi', 'default', 'a=1&b=2&c=3')
+        self.assertEqual(so, b'HTTP/1.0 200 OK\r\nServer: fnord/2.0\r\nPragma: no-cache\r\nConnection: close\r\nContent-Type: text/plain\r\n\nCONTENT_LENGTH=11\nCONTENT_TYPE=application/x-www-form-urlencoded\nGATEWAY_INTERFACE=CGI/1.1\nREMOTE_ADDR=10.1.2.3\nREMOTE_PORT=5858\nREQUEST_METHOD=POST\nREQUEST_URI=/cgi/set.cgi\nSCRIPT_NAME=/cgi/set.cgi\nSERVER_NAME=default:80\nSERVER_PORT=80\nSERVER_PROTOCOL=HTTP/1.0\nSERVER_SOFTWARE=fnord/2.0\nForm data: a=1&b=2&c=3')
 
 unittest.main()
+