diff --git a/Run-Tests.sh b/Run-Tests.sh
index 26c5bdd..b91929c 100755
--- a/Run-Tests.sh
+++ b/Run-Tests.sh
@@ -45,6 +45,8 @@ xcodebuild -sdk "$OSX_SDK" -target "$OSX_TARGET" -configuration "$CONFIGURATION"
# Run tests
runTests $MRC_PRODUCT "htmlForm" "Tests/HTMLForm"
runTests $ARC_PRODUCT "htmlForm" "Tests/HTMLForm"
+runTests $MRC_PRODUCT "htmlFileUpload" "Tests/HTMLFileUpload"
+runTests $ARC_PRODUCT "htmlFileUpload" "Tests/HTMLFileUpload"
runTests $MRC_PRODUCT "webServer" "Tests/WebServer"
runTests $ARC_PRODUCT "webServer" "Tests/WebServer"
runTests $MRC_PRODUCT "webDAV" "Tests/WebDAV-Transmit"
diff --git a/Tests/HTMLFileUpload/001-200.response b/Tests/HTMLFileUpload/001-200.response
new file mode 100644
index 0000000..f39660c
--- /dev/null
+++ b/Tests/HTMLFileUpload/001-200.response
@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Cache-Control: no-cache
+Content-Length: 299
+Content-Type: text/html; charset=utf-8
+Connection: Close
+Server: GCDWebServer
+Date: Fri, 25 Apr 2014 14:15:11 GMT
+
+
\ No newline at end of file
diff --git a/Tests/HTMLFileUpload/001-GET.request b/Tests/HTMLFileUpload/001-GET.request
new file mode 100644
index 0000000..6480774
--- /dev/null
+++ b/Tests/HTMLFileUpload/001-GET.request
@@ -0,0 +1,10 @@
+GET / HTTP/1.1
+Host: localhost:8080
+Connection: keep-alive
+Cache-Control: max-age=0
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36
+DNT: 1
+Accept-Encoding: gzip,deflate,sdch
+Accept-Language: en-US,en;q=0.8,fr;q=0.6
+
diff --git a/Tests/HTMLFileUpload/002-200.response b/Tests/HTMLFileUpload/002-200.response
new file mode 100644
index 0000000..be24ad1
--- /dev/null
+++ b/Tests/HTMLFileUpload/002-200.response
@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Cache-Control: no-cache
+Content-Length: 443
+Content-Type: text/html; charset=utf-8
+Connection: Close
+Server: GCDWebServer
+Date: Fri, 25 Apr 2014 14:15:21 GMT
+
+secret = 42
files = "hero_mba_11.jpg" (image/jpeg | 106 KB)
files = "Test File.txt" (text/plain | 0 KB)
\ No newline at end of file
diff --git a/Tests/HTMLFileUpload/002-POST.request b/Tests/HTMLFileUpload/002-POST.request
new file mode 100644
index 0000000..da29882
Binary files /dev/null and b/Tests/HTMLFileUpload/002-POST.request differ