diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b6cc81115..2b5e32111 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         os: ["macOS-latest", "ubuntu-latest"]
     steps:
       - uses: actions/checkout@v2
@@ -31,12 +31,11 @@ jobs:
         run: python -m pip install -U tox setuptools virtualenv wheel
       - name: Install and Run Tests
         run: tox -e py
-        if: runner.os != 'macOS'
+        if: matrix.python-version != '3.9'
       - name: Install and Run Tests
-        env:
-          QISKIT_IN_PARALLEL: TRUE
-        run: tox -e py
-        if: runner.os == 'macOS'
+        run: tox -e py39
+        if: matrix.python-version == '3.9'
+
   tests-no-opt:
     name: tests-python3.8-no-optional-dependencies
     runs-on: ${{ matrix.os }}
@@ -68,9 +67,12 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
+        # TODO: Add 3.9 to the list after aer 0.8.0 release
         python-version: [3.6, 3.7, 3.8]
     steps:
       - uses: actions/checkout@v2
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -90,6 +92,7 @@ jobs:
       - name: Install and Run Tests
         run: tox --sitepackages -epy
         shell: bash -l {0}
+
   lint:
     name: lint
     runs-on: ubuntu-latest
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 298420dc1..14b586092 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 pylint==2.4.4
 pycodestyle
-qiskit-aer>=0.3.0
+qiskit-aer>=0.3.0;python_version<'3.9'
 scikit-learn>=0.17
 Sphinx>=2.1
 sphinx-rtd-theme>=0.4.0
@@ -8,8 +8,8 @@ sphinx-tabs>=1.1.11
 sphinx-autodoc-typehints
 stestr>=2.5.0
 ddt>=1.2.0,!=1.4.0
-jupyter
-jupyter-sphinx
+jupyter;python_version<'3.9'
+jupyter-sphinx;python_version<'3.9'
 reno
 matplotlib
 pyfakefs
diff --git a/setup.py b/setup.py
index 9d33f0a2a..6a275942a 100644
--- a/setup.py
+++ b/setup.py
@@ -73,6 +73,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Scientific/Engineering",
     ],
     keywords="qiskit sdk quantum",
diff --git a/tools/build_aer.py b/tools/build_aer.py
deleted file mode 100755
index 466738d7e..000000000
--- a/tools/build_aer.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import shutil
-import subprocess
-import sys
-import tempfile
-
-
-
-if os.name == 'nt' or sys.platform == 'darwin':
-    subprocess.call(['pip', 'install', '-U',
-                     'git+https://github.com/Qiskit/qiskit-aer.git'])
-
-if sys.platform == 'linux' or sys.platform == 'linux2':
-    subprocess.call(['pip', 'install', '-U',
-                     'git+https://github.com/Qiskit/qiskit-aer.git',
-                     '--install-option', '--', '--install-option',
-                     '-DCMAKE_CXX_COMPILER=g++-7'])
diff --git a/tox.ini b/tox.ini
index 74c01ff4b..8c9ada10b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.1
-envlist = py36, py37, py38, lint
+envlist = py36, py37, py38, py39, lint
 skipsdist = True
 
 [testenv]
@@ -20,6 +20,14 @@ commands =
     pip install -U -c constraints.txt -r{toxinidir}/requirements-dev.txt
     pip check
     stestr run {posargs}
+# Remove after qiskit-aer 0.8.0 release:
+[testenv:py39]
+commands =
+    pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-terra.git
+    pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-aer.git
+    pip install -U -c constraints.txt -r{toxinidir}/requirements-dev.txt
+    pip check
+    stestr run {posargs}
 
 [testenv:no-opt]
 deps =