diff --git a/tests/pjsua/mod_media_playrec.py b/tests/pjsua/mod_media_playrec.py
index ef6ed7922..39efd0518 100644
--- a/tests/pjsua/mod_media_playrec.py
+++ b/tests/pjsua/mod_media_playrec.py
@@ -20,7 +20,14 @@ from inc_cfg import *
 cfg_file = imp.load_source("cfg_file", ARGS[1])
 
 # WAV similarity calculator
-COMPARE_WAV_EXE = "tools/cmp_wav.exe"
+COMPARE_WAV_EXE = ""
+if sys.platform.find("win32")!=-1:
+    COMPARE_WAV_EXE = "tools/cmp_wav.exe"
+    G_INUNIX = False
+else:
+    COMPARE_WAV_EXE = "tools/cmp_wav"
+    G_INUNIX = True
+
 
 # Threshold to declare degradation is too high when result is lower than this value
 COMPARE_THRESHOLD = 2
@@ -78,7 +85,7 @@ def post_func(t):
 	# Check WAV similarity
 	fullcmd = COMPARE_WAV_EXE + " " + input_filename + " " + output_filename + " " + "3000"
 	endpt.trace("Popen " + fullcmd)
-	cmp_proc = subprocess.Popen(fullcmd, stdout=subprocess.PIPE, universal_newlines=True)
+	cmp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=subprocess.PIPE, universal_newlines=True)
 
 	# Parse similarity ouput
 	line = cmp_proc.stdout.readline()
diff --git a/tests/pjsua/scripts-sendto/999_message_no_body.py b/tests/pjsua/scripts-sendto/999_message_no_body.py
index 2e369edbf..c00960145 100644
--- a/tests/pjsua/scripts-sendto/999_message_no_body.py
+++ b/tests/pjsua/scripts-sendto/999_message_no_body.py
@@ -2,7 +2,7 @@
 import inc_sip as sip
 import inc_sdp as sdp
 
-# There's some report that incoming MESSAGE without body will crash pjsua
+# Incoming MESSAGE without body is now accepted
 #
 complete_msg = \
 """MESSAGE sip:localhost SIP/2.0
@@ -20,5 +20,5 @@ Content-Length: 50
 
 
 sendto_cfg = sip.SendtoCfg( "empty MESSAGE", "--null-audio --auto-answer 200", 
-			    "", 488, complete_msg=complete_msg)
+			    "", 200, complete_msg=complete_msg)
 
diff --git a/tests/pjsua/tools/Makefile b/tests/pjsua/tools/Makefile
new file mode 100644
index 000000000..189eb00c1
--- /dev/null
+++ b/tests/pjsua/tools/Makefile
@@ -0,0 +1,21 @@
+#Modify this to point to the PJSIP location.
+PJBASE=~/Desktop/project/pjproject
+
+include $(PJBASE)/build.mak
+
+CC      = $(APP_CC)
+LDFLAGS = $(APP_LDFLAGS)
+LDLIBS  = $(APP_LDLIBS)
+CFLAGS  = $(APP_CFLAGS)
+CPPFLAGS= ${CFLAGS}
+
+# If your application is in a file named myapp.cpp or myapp.c
+# # this is the line you will need to build the binary.
+# all: myapp
+#
+cmp_wav: cmp_wav.c
+	$(CC) -o $@ $< $(CPPFLAGS) $(LDFLAGS) $(LDLIBS)
+
+clean:
+	rm -f cmp_wav.o cmp_wav
+