diff --git a/build.gradle b/build.gradle
index af79dccf99..f794ae7f59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,9 @@ task apidocs(type: Javadoc) {
 }
 
 task docSiteLogin(type: Login) {
-    host = sshHost
+    if (hasProperty('sshHost')) {
+        host = property('sshHost')
+    }
 }
 
 // Define remoteSiteDir and sshHost in gradle.properties
@@ -93,7 +95,9 @@ task uploadDoc(type: TarUpload) {
 task uploadFaq(type: TarUpload) {
     dependsOn ':faq:docbookHtmlSingle'
     classifier = 'faq'
-    remoteDir = project.property('remoteSiteDir')
+    if (hasProperty('remoteSiteDir')) {
+        remoteDir = property('remoteSiteDir')
+    }
     login = docSiteLogin
 
     def faqDir = new File(project(':faq').buildDir, 'docs')
diff --git a/web/web.gradle b/web/web.gradle
index 6357370cd2..a47e5531d7 100644
--- a/web/web.gradle
+++ b/web/web.gradle
@@ -16,4 +16,5 @@ dependencies {
     provided 'javax.servlet:servlet-api:2.5'
 
     testCompile 'commons-codec:commons-codec:1.3'
+    testRuntime "hsqldb:hsqldb:$hsqlVersion"
 }