diff --git a/pytests/tests/test_history.py b/pytests/tests/test_history.py
new file mode 100644
index 00000000..db7aa2ac
--- /dev/null
+++ b/pytests/tests/test_history.py
@@ -0,0 +1,147 @@
+#
+# Copyright (C) 2021-2022 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the GNU General Public License v2 (the "License");
+# you may not use this file except in compliance with the License. The terms
+# of the License are located in the COPYING file of this distribution.
+#
+
+import pytest
+
+
+@pytest.fixture(scope='function', autouse=True)
+def setup_test(utils):
+    yield
+    teardown_test(utils)
+
+
+def teardown_test(utils):
+    pkgname1 = utils.config["mulversion_pkgname"]
+    pkgname2 = utils.config["sglversion_pkgname"]
+    pkgname3 = utils.config["sglversion2_pkgname"]
+    for pkg in [pkgname1, pkgname2, pkgname3]:
+        utils.erase_package(pkg)
+
+
+def test_history_list(utils):
+    pkgname = utils.config["mulversion_pkgname"]
+
+    utils.erase_package(pkgname)
+
+    utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkgname])
+    assert(utils.check_package(pkgname))
+    ret = utils.run(['tdnf', 'history'])
+    assert(ret['retval'] == 0)
+    # 'install' must be in history output
+    assert('install' in '\n'.join(ret['stdout']))
+
+    ret = utils.run(['tdnf', 'history', '--info'])
+    assert(ret['retval'] == 0)
+    # pkgname must be in history info output
+    assert(pkgname in '\n'.join(ret['stdout']))
+
+    utils.erase_package(pkgname)
+    assert(not utils.check_package(pkgname))
+    ret = utils.run(['tdnf', 'history'])
+    assert(ret['retval'] == 0)
+    # 'erase' must be in history output
+    assert('erase' in '\n'.join(ret['stdout']))
+
+    ret = utils.run(['tdnf', 'history'])
+    last = ret['stdout'][-1].split()[0]
+
+    ret = utils.run(['tdnf', 'history', '--reverse'])
+    rev_last = ret['stdout'][-1].split()[0]
+    rev_first = ret['stdout'][1].split()[0]
+
+    assert (last == rev_first)
+    assert (int(rev_last) < int(rev_first))
+
+
+def test_history_rollback(utils):
+    pkgname = utils.config["mulversion_pkgname"]
+    utils.erase_package(pkgname)
+
+    ret = utils.run(['tdnf', 'history'])
+    baseline = ret['stdout'][-1].split()[0]
+
+    utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkgname])
+    assert(utils.check_package(pkgname))
+
+    utils.run(['tdnf', 'history', '-y', 'rollback', '--to', baseline])
+    assert(ret['retval'] == 0)
+
+
+def test_history_undo(utils):
+    pkgname1 = utils.config["mulversion_pkgname"]
+    pkgname2 = utils.config["sglversion_pkgname"]
+    pkgname3 = utils.config["sglversion2_pkgname"]
+
+    for pkg in [pkgname1, pkgname2, pkgname2]:
+        utils.erase_package(pkg)
+
+    ret = utils.run(['tdnf', 'history'])
+    baseline = ret['stdout'][-1].split()[0]
+
+    for pkg in [pkgname1, pkgname2, pkgname3]:
+        utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkg])
+        assert(utils.check_package(pkg))
+
+    # should undo install of pkgname2
+    utils.run(['tdnf', 'history', '-y', 'undo', '--from', str(int(baseline) + 2)])
+    assert(ret['retval'] == 0)
+    assert(not utils.check_package(pkgname2))
+
+
+def test_history_undo_multiple(utils):
+    pkgname1 = utils.config["mulversion_pkgname"]
+    pkgname2 = utils.config["sglversion_pkgname"]
+    pkgname3 = utils.config["sglversion2_pkgname"]
+
+    for pkg in [pkgname1, pkgname2, pkgname2]:
+        utils.erase_package(pkg)
+
+    ret = utils.run(['tdnf', 'history'])
+    baseline = ret['stdout'][-1].split()[0]
+
+    for pkg in [pkgname1, pkgname2, pkgname3]:
+        utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkg])
+        assert(utils.check_package(pkg))
+
+    utils.run(['tdnf', 'history', '-y', 'undo', '--from', str(int(baseline) + 1), '--to', str(int(baseline) + 3)])
+    assert(ret['retval'] == 0)
+    assert(not utils.check_package(pkgname1))
+    assert(not utils.check_package(pkgname2))
+    assert(not utils.check_package(pkgname3))
+
+
+def test_history_redo(utils):
+    pkgname1 = utils.config["mulversion_pkgname"]
+    pkgname2 = utils.config["sglversion_pkgname"]
+    pkgname3 = utils.config["sglversion2_pkgname"]
+
+    for pkg in [pkgname1, pkgname2, pkgname3]:
+        utils.erase_package(pkg)
+
+    ret = utils.run(['tdnf', 'history'])
+    baseline = ret['stdout'][-1].split()[0]
+
+    for pkg in [pkgname1, pkgname2, pkgname2]:
+        utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkg])
+        assert(utils.check_package(pkg))
+
+    utils.erase_package(pkgname2)
+    assert(not utils.check_package(pkgname2))
+
+    # should redo install of pkgname2
+    utils.run(['tdnf', 'history', '-y', 'redo', '--from', str(int(baseline) + 2)])
+    assert(ret['retval'] == 0)
+    assert(utils.check_package(pkgname2))
+
+
+def test_history_memcheck(utils):
+    ret = utils.run_memcheck(['tdnf', 'history'])
+    assert(ret['retval'] == 0)
+
+    ret = utils.run_memcheck(['tdnf', 'history', '--info'])
+    assert(ret['retval'] == 0)
diff --git a/pytests/tests/test_json.py b/pytests/tests/test_json.py
index b670bf3b..19da8f2f 100644
--- a/pytests/tests/test_json.py
+++ b/pytests/tests/test_json.py
@@ -135,6 +135,12 @@ def test_updateinfo_info(utils):
     assert(type(d) == list)
 
 
+def test_history_info(utils):
+    ret = utils.run(['tdnf', '-j', 'history', '--info'])
+    d = json.loads("\n".join(ret['stdout']))
+    assert(type(d) == list)
+
+
 def test_jsondump(utils):
     cmd = os.path.join(utils.config['build_dir'], 'bin/jsondumptest')
     ret = utils.run([cmd])