diff --git a/.gitignore b/.gitignore
index abfbce8..f5e239f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /buildstream-1.6.0.tar.bz2
 /buildstream-1.6.1.tar.bz2
 /buildstream-1.6.2.tar.gz
+/buildstream-1.6.3.tar.gz
diff --git a/buildstream.spec b/buildstream.spec
index 8a844cb..03294d1 100644
--- a/buildstream.spec
+++ b/buildstream.spec
@@ -1,50 +1,64 @@
+# Disable the tests for now, too many unavailable dependencies.
+# Tests works with enabled network. Also possible to run tests in COPR:
+# https://download.copr.fedorainfracloud.org/results/atim/buildstream/fedora-35-x86_64/02660103-buildstream/builder-live.log.gz
+%bcond_with test
+
 Name:          buildstream
 Summary:       Build/integrate software stacks
 License:       LGPLv2+
 URL:           https://buildstream.gitlab.io/buildstream/
 
-Version:       1.6.2
-Release:       2%{?dist}
+Version:       1.6.3
+Release:       1%{?dist}
 Source0:       https://github.com/apache/buildstream/archive/%{version}/buildstream-%{version}.tar.gz
 
 BuildRequires: bubblewrap >= 0.1.2
+BuildRequires: make
 BuildRequires: python3-devel >= 3.5
-BuildRequires: python3-pylint
-BuildRequires: python3-pytest >= 3.7
 BuildRequires: python3-pytest-runner
-BuildRequires: python3-pytest-timeout
-BuildRequires: python3-pytest-xdist
-BuildRequires: python3-setuptools
 BuildRequires: python3-sphinx
-BuildRequires: python3-sphinx-click
 BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-sphinx-click
 
-# These aren't in Fedora any more, preventing us from running the tests.
-# Buildstream master moved to pycodestyle though, so this will sort itself out.
-#BuildRequires: python3-pep8
-#BuildRequires: python3-pytest-pep8
-
-# These aren't in Fedora yet, preventing us from running the tests
-#BuildRequires: python3-pytest-datafiles
-#BuildRequires: python3-pytest-env
-#BuildRequires: python3-pytest-pylint
-
-# Runtime deps, required to build the docs and run the tests
+# These from plugin-requirements.in + requirements.in
 BuildRequires: fuse-libs
 BuildRequires: ostree-libs
 BuildRequires: python3-arpy
 BuildRequires: python3-click
 BuildRequires: python3-gobject
-BuildRequires: python3-grpcio >= 1.10
+BuildRequires: python3-grpcio >= 1.30
 BuildRequires: python3-jinja2 >= 2.10
 BuildRequires: python3-pluginbase
-BuildRequires: python3-protobuf >= 3.5
+BuildRequires: python3-protobuf >= 3.6
 BuildRequires: python3-psutil
 BuildRequires: python3-ruamel-yaml >= 0.16
+BuildRequires: python3-setuptools
 BuildRequires: python3-ujson
-BuildRequires: make
 
-Requires:      bubblewrap
+%if %{with test}
+# These from cov-requirements.in + dev-requirements.in
+BuildRequires: python3-coverage >= 4.4
+BuildRequires: python3-pylint >= 2.10
+BuildRequires: python3-pytest >= 3.7
+BuildRequires: python3-pytest-cov >= 2.5
+BuildRequires: python3-pytest-timeout
+BuildRequires: python3-pytest-xdist
+BuildRequires: python3-pep8
+BuildRequires: python3-pytest-datafiles
+BuildRequires: python3-pytest-env
+%endif
+
+# These aren't in Fedora any more, preventing us from running the tests.
+# Buildstream master moved to pycodestyle though, so this will sort itself out.
+#   * python3-pep8
+#   * python3-pytest-pep8
+
+# These aren't in Fedora yet, preventing us from running the tests
+#   * python3-pytest-datafiles
+#   * python3-pytest-env
+#   * python3-pytest-pylint
+
+Requires:      bubblewrap >= 0.1.2
 Requires:      fuse
 Requires:      fuse-libs
 Requires:      git
@@ -54,10 +68,10 @@ Requires:      patch
 Requires:      python3-arpy
 Requires:      python3-click
 Requires:      python3-gobject
-Requires:      python3-grpcio >= 1.10
+Requires:      python3-grpcio >= 1.30
 Requires:      python3-jinja2 >= 2.10
 Requires:      python3-pluginbase
-Requires:      python3-protobuf >= 3.5
+Requires:      python3-protobuf >= 3.6
 Requires:      python3-psutil
 Requires:      python3-ruamel-yaml >= 0.16
 Requires:      python3-setuptools
@@ -114,9 +128,10 @@ mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/
 cp -pr doc/build/devhelp %{buildroot}%{_datadir}/gtk-doc/html/BuildStream
 
 
-# Disable the tests for now, too many unavailable dependencies
+%if %{with test}
 %check
-#%%{__python3} setup.py test
+%{__python3} setup.py test
+%endif
 
 
 %files
@@ -124,16 +139,18 @@ cp -pr doc/build/devhelp %{buildroot}%{_datadir}/gtk-doc/html/BuildStream
 %license COPYING
 %{_bindir}/bst*
 %{python3_sitelib}/BuildStream-%{version}*.egg-info
-%{python3_sitelib}/buildstream
+%{python3_sitelib}/%{name}/
 %{_datadir}/bash-completion/completions/bst
-%{_mandir}/man1/bst*
-
+%{_mandir}/man1/*.1*
 
 %files docs
 %{_datadir}/gtk-doc
 
 
 %changelog
+* Wed Aug 25 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.3-1
+- build(update): 1.6.3
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 2231b1e..8943646 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (buildstream-1.6.2.tar.gz) = afcb9a75edd72211191416e5d8c0b49b8373b92248305600f1039bc49784367d873541b1fd8eefa2207cd888b3317745ecc8420fcf577873e61333991cc05cec
+SHA512 (buildstream-1.6.3.tar.gz) = efc221fe0d43bafdac44fd396cf6c38908e4f1f168db40650b3064a2a69b85986d84a51cc50c1f169953448d13f9fc750ece6246f2cd39a9c78dfdb030a7f208