diff --git a/.travis.yml b/.travis.yml
index def93a0..08407ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.7"
+  - "3.10"
 
 branches:
   only:
@@ -12,4 +12,4 @@ env:
 install:
   - pip install .[tests]
 
-script: python setup.py nosetests
+script: pytest --ignore ait/dsn/bin/examples --cov=ait
diff --git a/ait/dsn/bch/test/bch_test.py b/ait/dsn/bch/test/bch_test.py
index 29e5136..e4d5c68 100644
--- a/ait/dsn/bch/test/bch_test.py
+++ b/ait/dsn/bch/test/bch_test.py
@@ -14,7 +14,7 @@
 
 import os
 import unittest
-import mock
+from unittest import mock
 
 import ait.core
 from ait.dsn.bch.bch import BCH
diff --git a/ait/dsn/encrypt/test/test_encrypt.py b/ait/dsn/encrypt/test/test_encrypt.py
index 4c7034f..10d5c8a 100644
--- a/ait/dsn/encrypt/test/test_encrypt.py
+++ b/ait/dsn/encrypt/test/test_encrypt.py
@@ -18,7 +18,7 @@
 import unittest
 import binascii
 
-import nose.tools
+import pytest
 from unittest import mock
 
 import ait.core.cfg as cfg
@@ -71,7 +71,7 @@ def test_factory(self):
         encr = EncrypterFactory().get(null_classname)
         assert isinstance(encr, NullEncrypter)
 
-        with nose.tools.assert_raises(ImportError):
+        with pytest.raises(ImportError):
             EncrypterFactory().get(invalid_classname)
 
 class TestNullEncrypter(unittest.TestCase):
@@ -144,7 +144,7 @@ def test_kmc_encrypter(self):
         assert ait_result.has_errors
 
         # Failed import of KMC lib results in a Name error
-        #with nose.tools.assert_raises(NameError):
+        #with pytest.raises(NameError):
         #    encr.connect()
         encr.connect()
         assert not encr.is_connected()
diff --git a/ait/dsn/sle/test/frames_test.py b/ait/dsn/sle/test/frames_test.py
index c3c2118..a222174 100644
--- a/ait/dsn/sle/test/frames_test.py
+++ b/ait/dsn/sle/test/frames_test.py
@@ -14,7 +14,7 @@
 
 import os
 import unittest
-import mock
+from unittest import mock
 
 import ait.core
 from ait.dsn.sle.frames import AOSTransFrame, AOSConfig, AOSDataFieldType
diff --git a/config/leapseconds.dat b/config/leapseconds.dat
new file mode 100644
index 0000000..485afce
Binary files /dev/null and b/config/leapseconds.dat differ
diff --git a/doc/Makefile b/doc/Makefile
index 1133d32..f3536a7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -9,7 +9,7 @@ BUILDDIR      = build
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-	$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don\'t have Sphinx installed, grab it from http://sphinx-doc.org/)
+    $(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don\'t have Sphinx installed, grab it from http://sphinx-doc.org/)
 endif
 
 # Internal variables.
diff --git a/doc/make.bat b/doc/make.bat
old mode 100644
new mode 100755
diff --git a/readthedocs.yml b/readthedocs.yml
index f69b855..0d606b8 100644
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -1,7 +1,7 @@
 formats:
     - none
 python:
-    version: 3.7
+    version: 3.10
     pip_install: true
     extra_requirements:
         - docs
diff --git a/setup.py b/setup.py
index e6a2672..5573321 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
 
 setup(
     name = 'ait-dsn',
-    version = '2.0.1-rc1',
+    version = '2.1.0',
     description  = description,
     long_description = long_description,
     long_description_content_type = 'text/x-rst',
@@ -38,8 +38,7 @@
     namespace_packages = ['ait'],
 
     install_requires = [
-        'greenlet==0.4.16',
-        'ait-core>=2.0.0',
+        'ait-core>=2.4.0',
         'pyasn1',
         'bitstring'
     ],
@@ -51,9 +50,8 @@
             'sphinxcontrib-httpdomain'
         ],
         'tests': [
-            'nose',
-            'coverage',
-            'mock',
+            'pytest',
+            'pytest-cov',
             'pylint'
         ],
     },