diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3e7e969
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+**/*.pyc
+.pydevproject
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..dfd38c8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: python
+python:
+  - "2.7"
+
+script: python test/wait-for-it.py
diff --git a/test/wait-for-it.py b/test/wait-for-it.py
new file mode 100644
index 0000000..88b478c
--- /dev/null
+++ b/test/wait-for-it.py
@@ -0,0 +1,40 @@
+import unittest
+import subprocess
+import shlex
+from subprocess import Popen, PIPE
+import os
+import sys
+
+
+class TestWaitForIt(unittest.TestCase):
+
+    
+    def execute(self,cmd):
+        """Executes a command and returns exit code, STDOUT, STDERR"""
+        args = shlex.split(cmd)
+        proc = Popen(args, stdout=PIPE, stderr=PIPE)
+        out, err = proc.communicate()
+        exitcode = proc.returncode
+        return exitcode, out, err
+    
+    def setUp(self):
+        script_path = os.path.dirname(sys.argv[0])
+        parent_path = os.path.abspath(os.path.join(script_path, os.pardir))
+        self.wait_script = os.path.join(parent_path,"wait-for-it.sh")
+
+    def test_no_args_return_code(self):
+        # Return code should be 1 when called with no args
+        exitcode, out, err = self.execute(self.wait_script)
+        self.assertEqual(exitcode,1)        
+        
+    def test_help(self):
+        exitcode, out, err = self.execute(self.wait_script+" --help")
+        # STDERR should begin with "Usage:"
+        self.assertTrue(err.startswith("Usage:"))
+        # exit code should be 1
+        self.assertEqual(exitcode,1)
+
+
+
+if __name__ == '__main__':
+    unittest.main()