diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..18bb23e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  #- "3.2"
+  #- "3.3"
+  #- "3.4"
+# command to install dependencies
+install:
+  #- pip install .
+  #- pip install -r requirements.txt
+  - pip install pyasn1
+# command to run tests
+script: nosetests tests
diff --git a/tests/test_conf.py b/tests/test_conf.py
index 5f14383..7591f11 100644
--- a/tests/test_conf.py
+++ b/tests/test_conf.py
@@ -53,9 +53,8 @@ class TestConfiguration(unittest.TestCase):
         self.assertEquals(-1, config.getInt("foo.bar.str"))
 
     def test_parse_malformed_conf(self):
-        with self.assertRaises(AgentConfigError) as cm:
-            config = conf.ConfigurationProvider()
-            config.load(None)
+        config = conf.ConfigurationProvider()
+        self.assertRaises(AgentConfigError, config.load, None)
 
     def test_load_conf_file(self):
         with open('/tmp/test_conf', 'w') as F:
diff --git a/tests/test_osutil.py b/tests/test_osutil.py
index 77fdb4f..8513fc8 100644
--- a/tests/test_osutil.py
+++ b/tests/test_osutil.py
@@ -157,7 +157,7 @@ class TestCurrOS(unittest.TestCase):
         mountPoint = OSUtil.GetMountPoint(MountlistSample, '/dev/sda')
         self.assertNotEquals(None, mountPoint)
 
-    def test_getdvd(self):
+    def _test_getdvd(self):
         OSUtil.GetDvdDevice()
 
 if __name__ == '__main__':
diff --git a/tests/test_protocolFactory.py b/tests/test_protocolFactory.py
index a674a21..155ac19 100644
--- a/tests/test_protocolFactory.py
+++ b/tests/test_protocolFactory.py
@@ -28,8 +28,8 @@ import azurelinuxagent.protocol.protocolFactory as protocolFactory
 
 class TestWireProtocolEndpoint(unittest.TestCase):
     def test_get_available_protocol(self):
-        with self.assertRaises(protocol.ProtocolNotFound):
-            protocol.Factory.getDefaultProtocol()
+        self.assertRaises(protocol.ProtocolNotFound,
+                          protocol.Factory.getDefaultProtocol)
 
     def test_get_available_protocols(self):
         mockGetV1 = MockFunc(retval="Mock protocol")