diff --git a/ibm_db_ctx.py b/ibm_db_ctx.py
new file mode 100644
index 00000000..d092a0e3
--- /dev/null
+++ b/ibm_db_ctx.py
@@ -0,0 +1,26 @@
+import ibm_db
+
+class Db2connect:
+    """Context manager to handle connections to DB2."""
+    #__cxn: Optional['IBM_DBConnection'] 
+    
+    def __init__(self, dsn: str, username: str, password: str) -> None:
+        """Instantiate a DB2 connection."""
+        #print("init method called")
+        self.__dsn = dsn
+        self.__username = username
+        self.__password = password
+        self.__cxn = None
+
+    def __enter__(self) -> 'IBM_DBConnection':
+        """Connect to DB2."""
+        self.__cxn = ibm_db.connect(self.__dsn, '', '')
+        #print("enter method called")
+        return self.__cxn
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        """Disconnect from DB2."""
+        #print("exit method called")
+        ibm_db.close(self.__cxn)
+        self.__cxn = None      
+
diff --git a/ibm_db_tests/test_context_ConnActive.py b/ibm_db_tests/test_context_ConnActive.py
new file mode 100644
index 00000000..06e05273
--- /dev/null
+++ b/ibm_db_tests/test_context_ConnActive.py
@@ -0,0 +1,63 @@
+#
+#  Licensed Materials - Property of IBM
+#
+#  (c) Copyright IBM Corp. 2007-2008
+#
+
+from __future__ import print_function
+import sys
+import unittest
+import os
+os.add_dll_directory("C:\\Users\\ek\\Downloads\\ntx64_odbc_cli\\clidriver\\bin")
+import ibm_db
+import config
+import platform
+import ibm_db_ctx
+
+from testfunctions import IbmDbTestFunctions
+
+class IbmDbTestCase(unittest.TestCase):
+    @unittest.skipIf(platform.system() == 'z/OS',"Test fails with z/OS ODBC driver")
+    def test_context_ConnActive(self):
+        obj = IbmDbTestFunctions()
+        obj.assert_expect(self.run_test_context_ConnActive)
+
+    def run_test_context_ConnActive(self):
+        conn = None
+        is_alive = ibm_db.active(conn)
+        if is_alive:
+            print("Is active")
+        else:
+            print("Is not active")
+
+        with ibm_db_ctx.Db2connect(config.database, config.user, config.password) as conn:
+            is_alive = ibm_db.active(conn)
+            if is_alive:
+                print("Is active")
+            else:
+                print("Is not active")
+
+        is_alive = ibm_db.active(conn)
+        if is_alive:
+            print("Is active")
+        else:
+            print("Is not active")
+
+
+#__END__
+#__LUW_EXPECTED__
+#Is not active
+#Is active
+#Is not active
+#__ZOS_EXPECTED__
+#Is not active
+#Is active
+#Is not active
+#__SYSTEMI_EXPECTED__
+#Is not active
+#Is active
+#Is not active
+#__IDS_EXPECTED__
+#Is not active
+#Is active
+#Is not active
diff --git a/ibm_db_tests/test_context_ConnDb.py b/ibm_db_tests/test_context_ConnDb.py
new file mode 100644
index 00000000..f52f4840
--- /dev/null
+++ b/ibm_db_tests/test_context_ConnDb.py
@@ -0,0 +1,34 @@
+#
+#  Licensed Materials - Property of IBM
+#
+#  (c) Copyright IBM Corp. 2007-2008
+#
+
+from __future__ import print_function
+import sys
+import unittest
+import ibm_db
+import config
+from testfunctions import IbmDbTestFunctions
+import ibm_db_ctx
+
+class IbmDbTestCase(unittest.TestCase):
+
+    def test_context_ConnDb(self):
+        obj = IbmDbTestFunctions()
+        obj.assert_expect(self.run_test_context)
+
+    def run_test_context_ConnDb(self):
+        with ibm_db_ctx.Db2connect(config.database, config.user, config.password) as conn:
+            print("Connection succeeded.")
+		   
+
+#__END__
+#__LUW_EXPECTED__
+#Connection succeeded.
+#__ZOS_EXPECTED__
+#Connection succeeded.
+#__SYSTEMI_EXPECTED__
+#Connection succeeded.
+#__IDS_EXPECTED__
+#Connection succeeded.
\ No newline at end of file
diff --git a/ibm_db_tests/test_context_ConnDbUncatalogedConn.py b/ibm_db_tests/test_context_ConnDbUncatalogedConn.py
new file mode 100644
index 00000000..7f10a04a
--- /dev/null
+++ b/ibm_db_tests/test_context_ConnDbUncatalogedConn.py
@@ -0,0 +1,38 @@
+#
+#  Licensed Materials - Property of IBM
+#
+#  (c) Copyright IBM Corp. 2007-2008
+#
+
+from __future__ import print_function
+import sys
+import unittest
+import os
+os.add_dll_directory("C:\\Users\\ek\\Downloads\\ntx64_odbc_cli\\clidriver\\bin")
+import ibm_db
+import config
+from testfunctions import IbmDbTestFunctions
+import ibm_db_ctx
+
+class IbmDbTestCase(unittest.TestCase):
+
+    def test_context_ConnDbUncatalogedConn(self):
+        obj = IbmDbTestFunctions()
+        obj.assert_expect(self.run_test_context2)
+
+    def run_test_context_ConnDbUncatalogedConn(self):
+        conn_str = "DATABASE=%s;HOSTNAME=%s;PORT=%d;PROTOCOL=TCPIP;UID=%s;PWD=%s;" % (config.database, config.hostname, config.port, config.user, config.password)
+        with ibm_db_ctx.Db2connect(conn_str,'','') as conn:
+            print("Connection succeeded.")
+		
+                
+
+#__END__
+#__LUW_EXPECTED__
+#Connection succeeded.
+#__ZOS_EXPECTED__
+#Connection succeeded.
+#__SYSTEMI_EXPECTED__
+#Connection succeeded.
+#__IDS_EXPECTED__
+#Connection succeeded.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 16b3fe3a..7ee47535 100644
--- a/setup.py
+++ b/setup.py
@@ -486,7 +486,7 @@ def print_exception( e, url):
                (get_python_lib(), ['./LICENSE']),
                (get_python_lib(), ['./config.py.sample'])]
 
-modules = ['ibm_db_dbi', 'testfunctions', 'ibmdb_tests']
+modules = ['ibm_db_dbi', 'testfunctions', 'ibmdb_tests', 'ibm_db_ctx']
 
 if 'zos' == sys.platform:
     ext_modules = _ext_modules(os.path.join(os.getcwd(), include_dir), library, ibm_db_lib, ibm_db_lib_runtime)