diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6886a50..73ade6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,31 @@
 version: 2
 jobs:
-  test:
+  test37:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.7
     steps:
       - checkout
       - run: pip install --user nox
       - run: ~/.local/bin/nox
+  test38:
+    docker:
+      - image: circleci/python:3.8
+    steps:
+      - checkout
+      - run: pip install --user nox
+      - run: ~/.local/bin/nox  
+  test39:
+    docker:
+      - image: circleci/python:3.9
+    steps:
+      - checkout
+      - run: pip install --user nox
+      - run: ~/.local/bin/nox            
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - test
+      - test37
+      - test38
+      - test39
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 58cafed..61486fe 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/README.rst b/README.rst
index bddb192..a0bf1fe 100644
--- a/README.rst
+++ b/README.rst
@@ -455,6 +455,9 @@ Below example shows how to change logging level.
 Changelog
 ---------
 
+* Fix bug with `__setstate__` method. Calling super so that mixin such as baikal can work properly 
+* adding test for Python 3.9
+
 2.0.4 (2020-11-06)
 ******************
 
diff --git a/noxfile.py b/noxfile.py
index 0d391bd..f613163 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -9,9 +9,9 @@ def lint(session):
     session.run('flake8', 'sklearn_pandas/', 'tests')
 
 @nox.session
-@nox.parametrize('numpy', ['1.18.1', '1.19.4'])
-@nox.parametrize('scipy', ['1.4.1', '1.5.4'])
-@nox.parametrize('pandas', ['1.0.5', '1.1.4'])
+@nox.parametrize('numpy', ['1.18.1', '1.19.4', '1.20.1'])
+@nox.parametrize('scipy', ['1.4.1', '1.5.4', '1.6.0'])
+@nox.parametrize('pandas', ['1.0.5', '1.1.4', '1.2.2'])
 def tests(session, numpy, scipy, pandas):
     session.install('pytest==5.3.5', 
                     'setuptools==45.2',
diff --git a/sklearn_pandas/dataframe_mapper.py b/sklearn_pandas/dataframe_mapper.py
index 471dfd3..d5a22f9 100644
--- a/sklearn_pandas/dataframe_mapper.py
+++ b/sklearn_pandas/dataframe_mapper.py
@@ -156,6 +156,7 @@ def _unselected_columns(self, X):
 
     def __setstate__(self, state):
         # compatibility for older versions of sklearn-pandas
+        super().__setstate__(state)
         self.features = [_build_feature(*feat) for feat in state['features']]
         self.sparse = state.get('sparse', False)
         self.default = state.get('default', False)