--- a/tests/test_authority.py
+++ b/tests/test_authority.py
@@ -28,7 +28,6 @@
 import sys
 import requests
 import httpretty
-import six
 
 try:
     import unittest2 as unittest
@@ -136,7 +135,7 @@
     def test_http_error(self):
         util.setup_expected_instance_discovery_request(500, cp['authorityHosts']['global'], None, self.nonHardCodedAuthorizeEndpoint)
 
-        with six.assertRaisesRegex(self, Exception, '500'):
+        with self.assertRaisesRegex(Exception, '500'):
             context = adal.AuthenticationContext(self.nonHardCodedAuthority)
             token_response = context.acquire_token_with_client_credentials(
                  cp['resource'], cp['clientId'], cp['clientSecret'])
@@ -146,7 +145,7 @@
         returnDoc = { 'error' : 'invalid_instance', 'error_description' : 'the instance was invalid' }
         util.setup_expected_instance_discovery_request(400, cp['authorityHosts']['global'], returnDoc, self.nonHardCodedAuthorizeEndpoint)
 
-        with six.assertRaisesRegex(self, Exception, 'instance was invalid'):
+        with self.assertRaisesRegex(Exception, 'instance was invalid'):
             context = adal.AuthenticationContext(self.nonHardCodedAuthority)
             token_response = context.acquire_token_with_client_credentials(
                  cp['resource'], cp['clientId'], cp['clientSecret'])
@@ -177,17 +176,17 @@
 
     @httpretty.activate
     def test_bad_url_not_https(self):
-        with six.assertRaisesRegex(self, ValueError, "The authority url must be an https endpoint\."):
+        with self.assertRaisesRegex(ValueError, "The authority url must be an https endpoint\."):
             context = AuthenticationContext('http://this.is.not.https.com/mytenant.com')
 
     @httpretty.activate
     def test_bad_url_has_query(self):
-        with six.assertRaisesRegex(self, ValueError, "The authority url must not have a query string\."):
+        with self.assertRaisesRegex(ValueError, "The authority url must not have a query string\."):
             context = AuthenticationContext(cp['authorityTenant'] + '?this=should&not=be&here=foo')
 
     @httpretty.activate
     def test_url_extra_path_elements(self):
-        with six.assertRaisesRegex(self, ValueError, "tenant"):  # Some tenant specific error message
+        with self.assertRaisesRegex(ValueError, "tenant"):  # Some tenant specific error message
             context = AuthenticationContext(self.nonHardCodedAuthority + '/extra/path')
 
     @httpretty.activate
--- a/tests/test_client_credentials.py
+++ b/tests/test_client_credentials.py
@@ -28,7 +28,6 @@
 import unittest
 import json
 import httpretty
-import six
 
 import adal
 from adal.self_signed_jwt import SelfSignedJwt
@@ -63,7 +62,7 @@
     def test_http_error(self):
         tokenRequest = util.setup_expected_client_cred_token_request_response(403)
 
-        with six.assertRaisesRegex(self, Exception, '403'):
+        with self.assertRaisesRegex(Exception, '403'):
             context = adal.AuthenticationContext(cp['authUrl'])
             token_response = context.acquire_token_with_client_credentials(
                  cp['resource'], cp['clientId'], cp['clientSecret'])
@@ -78,7 +77,7 @@
 
         tokenRequest = util.setup_expected_client_cred_token_request_response(400, errorResponse)
 
-        with six.assertRaisesRegex(self, Exception, 'Get Token request returned http error: 400 and server response:'):
+        with self.assertRaisesRegex(Exception, 'Get Token request returned http error: 400 and server response:'):
             context = adal.AuthenticationContext(cp['authUrl'])
             token_response = context.acquire_token_with_client_credentials(
                  cp['resource'], cp['clientId'], cp['clientSecret'])
@@ -160,14 +159,14 @@
         cert = 'gobbledy'
         context = adal.AuthenticationContext(cp['authorityTenant'])
 
-        with six.assertRaisesRegex(self, Exception, "Error:Invalid Certificate: Expected Start of Certificate to be '-----BEGIN RSA PRIVATE KEY-----'"):
+        with self.assertRaisesRegex(Exception, "Error:Invalid Certificate: Expected Start of Certificate to be '-----BEGIN RSA PRIVATE KEY-----'"):
             context.acquire_token_with_client_certificate(cp['resource'], cp['clientId'], cert, cp['certHash'])
 
     def test_cert_bad_thumbprint(self):
         thumbprint = 'gobbledy'
         context = adal.AuthenticationContext(cp['authorityTenant'])
 
-        with six.assertRaisesRegex(self, Exception, 'thumbprint does not match a known format'):
+        with self.assertRaisesRegex(Exception, 'thumbprint does not match a known format'):
             context.acquire_token_with_client_certificate( cp['resource'], cp['clientId'], cp['cert'], thumbprint)
 
 
--- a/tests/test_wstrust_response.py
+++ b/tests/test_wstrust_response.py
@@ -27,7 +27,6 @@
 
 import unittest
 import os
-import six
 
 try:
     from xml.etree import cElementTree as ET
@@ -72,7 +71,7 @@
         wstrustResponse = WSTrustResponse(_call_context, errorResponse, WSTrustVersion.WSTRUST13)
 
         exception_text = "Server returned error in RSTR - ErrorCode: RequestFailed : FaultMessage: MSIS3127: The specified request failed"
-        with six.assertRaisesRegex(self, Exception, exception_text) as cm:
+        with self.assertRaisesRegex(Exception, exception_text) as cm:
             wstrustResponse.parse()
 
     def test_token_parsing_happy_path(self):
@@ -88,17 +87,17 @@
         self.assertEqual('1TIu064jGEmmf+hnI+F0Jg==', attribute_values[1].text)
 
     def test_rstr_none(self):
-        with six.assertRaisesRegex(self, Exception, 'Received empty RSTR response body.') as cm:
+        with self.assertRaisesRegex(Exception, 'Received empty RSTR response body.') as cm:
             wstrustResponse = WSTrustResponse(_call_context, None, WSTrustVersion.WSTRUST13)
             wstrustResponse.parse()
 
     def test_rstr_empty_string(self):
-        with six.assertRaisesRegex(self, Exception, 'Received empty RSTR response body.') as cm:
+        with self.assertRaisesRegex(Exception, 'Received empty RSTR response body.') as cm:
             wstrustResponse = WSTrustResponse(_call_context, '', WSTrustVersion.WSTRUST13)
             wstrustResponse.parse()
 
     def test_rstr_unparseable_xml(self):
-        with six.assertRaisesRegex(self, Exception, 'Failed to parse RSTR in to DOM'):
+        with self.assertRaisesRegex(Exception, 'Failed to parse RSTR in to DOM'):
             wstrustResponse = WSTrustResponse(_call_context, '<This is not parseable as an RSTR', WSTrustVersion.WSTRUST13)
             wstrustResponse.parse()