diff --git a/utils/airtime-test-soundcard.py b/utils/airtime-test-soundcard.py
new file mode 100644
index 000000000..4978cebce
--- /dev/null
+++ b/utils/airtime-test-soundcard.py
@@ -0,0 +1,53 @@
+import subprocess
+import os
+import pwd
+import grp
+import sys
+
+import getopt
+
+if os.geteuid() == 0:
+    print "Please run this program as non-root"
+    sys.exit(1)
+
+def printUsage():
+    print "airtime-test-soundcard [-v] [-o alsa | ao | oss | portaudio | pulseaudio ]"
+    print " Where: "
+    print "     -v verbose mode "
+    print "     -o Linux Sound API "
+
+
+optlist, args = getopt.getopt(sys.argv[1:], 'hvo:')
+sound_api_types = set(["alsa", "ao", "oss", "portaudio", "pulseaudio"])
+
+verbose = False
+sound_api = "alsa"
+for o, a in optlist:
+    if "-v" == o:
+        verbose = True
+    if "-o" == o:
+        if a.lower() in sound_api_types:
+            sound_api = a.lower()
+        else:
+            print "Unknown sound api type\n"
+            printUsage()
+            sys.exit(1)
+    if "-h" == o:
+        printUsage()
+        sys.exit(0)
+
+try:
+    print "Outputting to soundcard with '%s' sound API. You should be able to hear a monotonous tone. Press ctrl-c to quit." % sound_api
+        
+    command = "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap 'output.%s(sine())'" % sound_api
+    
+    if not verbose:
+        command += " > /dev/null"
+    
+    #print command
+    rv = subprocess.call(command, shell=True)
+    
+except KeyboardInterrupt, ki:
+    print "Exiting"
+except Exception, e:
+    raise
diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py
new file mode 100644
index 000000000..3c47b77ab
--- /dev/null
+++ b/utils/airtime-test-stream.py
@@ -0,0 +1,80 @@
+import subprocess
+import os
+import pwd
+import grp
+import sys
+
+import getopt
+
+if os.geteuid() == 0:
+    print "Please run this program as non-root"
+    sys.exit(1)
+
+def printUsage():
+    print "airtime-test-stream [-v] [-o icecast | shoutcast ] [-H hostname] [-P port] [-u username] [-p password] [-m mount]"
+    print " Where: "
+    print "     -v verbose mode"
+    print "     -o stream server type (default: icecast)"
+    print "     -H hostname (default: localhost) "
+    print "     -P port (default: 8000) "
+    print "     -u port (default: source) "
+    print "     -p password (default: hackme) "
+    print "     -m mount (default: test) "
+
+
+optlist, args = getopt.getopt(sys.argv[1:], 'hvo:H:P:u:p:')
+stream_types = set(["shoutcast", "icecast"])
+
+verbose = False
+stream_type = "icecast"
+
+host = "localhost"
+port = 8000
+user = "source"
+password = "hackme"
+mount = "test"
+
+for o, a in optlist:
+    if "-v" == o:
+        verbose = True
+    if "-o" == o:
+        if a.lower() in stream_types:
+            stream_type = a.lower()
+        else:
+            print "Unknown stream type\n"
+            printUsage()
+            sys.exit(1)
+    if "-h" == o:
+        printUsage()
+        sys.exit(0)
+    if "-H" == o:
+        host = a
+    if "-P" == o:
+        port = a
+    if "-u" == o:
+        user = a
+    if "-p" == o:
+        password = a
+    if "-m" == o:
+        mount = a
+
+try:
+    
+    url = "http://%s:%s/%s" % (host, port, mount)
+    print "Outputting to %s streaming server. You should be able to hear a monotonous tone on %s. Press ctrl-c to quit." % (stream_type, url)
+        
+    if stream_type == "icecast":
+        command = "liquidsoap 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount)
+    else:
+        command = "liquidsoap 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\",  sine())'" % (host, port, user, password, mount)
+        
+    if not verbose:
+        command += " > /dev/null"
+    
+    #print command
+    rv = subprocess.call(command, shell=True)
+    
+except KeyboardInterrupt, ki:
+    print "Exiting"
+except Exception, e:
+    raise