diff --git a/lib/haxe/src/org/apache/thrift/TBase.hx b/lib/haxe/src/org/apache/thrift/TBase.hx
index a35c752..ede0beb 100644
--- a/lib/haxe/src/org/apache/thrift/TBase.hx
+++ b/lib/haxe/src/org/apache/thrift/TBase.hx
@@ -19,6 +19,13 @@
 
 package org.apache.thrift;
 
+// Make sure we use at least 3.1.3
+// Some Linux platforms have waaaay too old packages in their repos
+// Pro Tip: Look at http://openfl.com for a good Linux install script
+#if( haxe_ver < 3.103)
+#error Haxe 3.1.3 or newer required, sorry!
+#end
+
 import org.apache.thrift.protocol.TProtocol;
 
   /**
diff --git a/test/haxe/Makefile.am b/test/haxe/Makefile.am
index 3d4894a..9b7548b 100644
--- a/test/haxe/Makefile.am
+++ b/test/haxe/Makefile.am
@@ -46,9 +46,10 @@
 	$(RM) -r gen-haxe bin
 
 check: $(BIN_CPP)
-	timeout 120 $(BIN_CPP) server &
+	timeout 10 $(BIN_CPP) server &
 	sleep 1
 	$(BIN_CPP) client
+	sleep 10
 
 EXTRA_DIST = \
              src \