diff --git a/nanodb b/nanodb
index 954a53813f5ed69cb38ebfbbb44f79768988a69f..ee19f567655a68c32a9fe64f3e19ec3c4eb59a77 100755
--- a/nanodb
+++ b/nanodb
@@ -19,14 +19,21 @@ JAVA_OPTS="-Dlog4j.configurationFile=log4j2.properties"
 # uncomment this line:
 # JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5009"
 
-
-# See if we have the rlwrap utility; if so, it makes using NanoDB
-# from the command-line sooo much nicer...
-testrl=$(which rlwrap)
-if [ -z "$testrl" ]
-then
-    java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
+PLATFORM=`uname`
+if [[ $PLATFORM == *"MINGW"* ]]; then
+	# Windows, probably git bash
+	WRAPPER=winpty
 else
-    rlwrap java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
+	# See if we have the rlwrap utility; if so, it makes using NanoDB
+	# from the command-line sooo much nicer...
+	testrl=$(which rlwrap)
+	if [ -z "$testrl" ]; then
+		# No wrapper
+		WRAPPER=
+	else
+		WRAPPER=rlwrap
+	fi
 fi
 
+$WRAPPER java $JAVA_OPTS "$@" -jar $NANODB_SERVER_JAR
+
diff --git a/pom.xml b/pom.xml
index df782a24bbae9c6a880d42435cb9e059a403a5cc..2ea0a779c71433106c6eb4e6f51ba963bb5b7f12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,8 @@
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
 
+                    <testFailureIgnore>true</testFailureIgnore>
+
                     <systemPropertyVariables>
                         <log4j.configurationFile>log4j2.properties</log4j.configurationFile>
                     </systemPropertyVariables>