diff --git a/.gitignore b/.gitignore
index 55e346d..e73ece1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /dacite-1.1.0.tar.gz
 /pcs-67591ed1487cb0aefa181fdfc166c8a66b55d25a.tar.gz
 /dacite-1.5.0.python3.9.fix.tar.gz
+/dacite-1.5.1.tar.gz
diff --git a/pcs.spec b/pcs.spec
index 23d37e5..c33005e 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.10.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
 # ASL 2.0: tornado
@@ -21,7 +21,7 @@ Summary: Pacemaker Configuration System
 
 %global pyagentx_version 0.4.pcs.2
 %global tornado_version 6.0.3
-%global dacite_version 1.5.0.python3.9.fix
+%global dacite_version 1.5.1
 %global rubygem_tilt_version 2.0.9
 
 # We do not use _libdir macro because upstream is not prepared for it.
@@ -51,9 +51,7 @@ Source11: https://rubygems.org/downloads/tilt-%{rubygem_tilt_version}.gem
 
 Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz
 Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz
-# Temporarily use patched version of dacite until it is fixed in upstream
-# Source44: https://github.com/konradhalas/dacite/archive/v%%{dacite_version}/dacite-%%{dacite_version}.tar.gz
-Source44: https://github.com/ondrejmular/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
+Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
 
 Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
 Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz
@@ -436,6 +434,10 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Thu Wed 15 2020 Ondrej Mular <omular@redhat.com> - 0.10.5-7
+- Use fixed upstream version of dacite with Python 3.9 support
+- Split upstream tests in gating into tiers
+
 * Fri Jul 03 2020 Ondrej Mular <omular@redhat.com> - 0.10.5-6
 - Use patched version of dacite compatible with Python 3.9
 - Resolves: rhbz#1838327
diff --git a/sources b/sources
index 66a0cc3..84b4f8e 100644
--- a/sources
+++ b/sources
@@ -5,4 +5,4 @@ SHA512 (pcs-web-ui-0.1.2.tar.gz) = 2fcb1c600cc644234036b47d7d277bb083945f3827c3f
 SHA512 (pcs-web-ui-node-modules-0.1.2.tar.xz) = 48bc9e60170e8aedf744c57d78813b5a2e241a104c9a309f551aeaaa808f1a2bd77c6bae46a5833e1502a0bf222774b2604dfd4f75b4ddc461e50f49bf73f468
 SHA512 (tilt-2.0.9.gem) = 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
 SHA512 (pcs-67591ed1487cb0aefa181fdfc166c8a66b55d25a.tar.gz) = ee2f38b3c13c338ad9b36e26f21d704ac278ed9efa466a4030279afadcbb7c755ae444d8967911ad24c99c1114bfe1d8538f9b74114850be63e20b20fa71195c
-SHA512 (dacite-1.5.0.python3.9.fix.tar.gz) = 2d735b333a5a6038056f045390ae495f77156bcc9843b613b2c47980888bf15605799d313dfa4d270aef2404bac5af894580c7e0c712f502109b3ae34db2af75
+SHA512 (dacite-1.5.1.tar.gz) = ac1a3ffcd7e75fe99e6a3baf8623d3caee8940f0d2a8e455f86d71f71e1ff76b0bfad0c112a2ebdf2a81d4be9c9bd99adea94603f674c28e68959cb299d0039d
diff --git a/tests/tests.yml b/tests/tests.yml
index 4987543..f4f86a0 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,6 +15,11 @@
       dest: "{{ tenv_workdir }}"
       mode: push
       ssh_args: "-o UserKnownHostsFile=/dev/null"
+  - name: Start pcsd
+    systemd:
+      state: started
+      name: pcsd.service
+      daemon_reload: yes
 
   roles:
   # roles documentation:
@@ -34,7 +39,7 @@
     - pcs
     - pcs-snmp
     required_services:
-    - pcsd
+    - pcsd.service
     tests:
     # dir: . -> dot means tests dir in distgit
     - prepare-source:
@@ -46,9 +51,12 @@
     - remove_sources:
         dir: ./source
         run: rm -rfv pcs
-    - run_upstream_tests:
+    - run_upstream_tier0_tests:
         dir: ./source
-        run: pcs_test/suite.py -v --vanilla --installed
+        run: pcs_test/suite.py --tier0 -v --vanilla --installed
+    - run_upstream_tier1_tests:
+        dir: ./source
+        run: pcs_test/suite.py --tier1 -v --vanilla --installed
     - run_smoke_tests:
         dir: ./source
         run: pcs_test/smoke.sh