diff --git a/cadabra2-2.3.2.tar.gz b/cadabra2-2.3.2.tar.gz
deleted file mode 100644
index d5ef885..0000000
--- a/cadabra2-2.3.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a17424f41703e4b5c72d44f2c3057f7ea10375ff4b41bbb1675d665a86a489ca
-size 24376316
diff --git a/cadabra2-2.3.5.tar.gz b/cadabra2-2.3.5.tar.gz
new file mode 100644
index 0000000..99f0d13
--- /dev/null
+++ b/cadabra2-2.3.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40f64156e44ccb7641a44e46c7415dfdb0422e1401082d96db541b83bba7ac77
+size 24527584
diff --git a/cadabra2-disable-components-test.patch b/cadabra2-disable-components-test.patch
new file mode 100644
index 0000000..1c56ed9
--- /dev/null
+++ b/cadabra2-disable-components-test.patch
@@ -0,0 +1,12 @@
+Index: cadabra2-2.3.5/tests/CMakeLists.txt
+===================================================================
+--- cadabra2-2.3.5.orig/tests/CMakeLists.txt
++++ cadabra2-2.3.5/tests/CMakeLists.txt
+@@ -68,7 +68,6 @@ set(RTESTS
+   trigonometric
+   noncovariant
+   algebra
+-  components
+   factor
+   field_theory
+   gamma_paper
diff --git a/cadabra2.changes b/cadabra2.changes
index c10c93c..298e520 100644
--- a/cadabra2.changes
+++ b/cadabra2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:09:12 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2.3.5:
+  * Relocate cadabra module to python_sitelib instead of
+    python_sitearch.
+- Add cadabra2-disable-components-test.patch: Disable a test that
+  crashes in the buildroot env -- but not in a user session -- for
+  unknown reasons (gh#kpeeters/cadabra2#212).
+- Enable tests since gh#kpeeters/cadabra2#211 is now resolved.
+- Add python3 to Requires for cadabra2.
+
 -------------------------------------------------------------------
 Sun Nov  1 09:55:08 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/cadabra2.spec b/cadabra2.spec
index d054b89..db90129 100644
--- a/cadabra2.spec
+++ b/cadabra2.spec
@@ -17,9 +17,9 @@
 
 
 # Tests fails due to the way PYTHONPATH is set up for the test-suite [gh#kpeeters/cadabra2#211, gh#kpeeters/cadabra2#212]
-%bcond_with tests
+%bcond_without tests
 Name:           cadabra2
-Version:        2.3.2
+Version:        2.3.5
 Release:        0
 Summary:        A computer algebra system for solving problems in field theory
 License:        GPL-3.0-or-later
@@ -27,6 +27,8 @@ Group:          Productivity/Scientific/Math
 URL:            https://cadabra.science/
 Source0:        https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}-gtk.appdata.xml
+# PATCH-FIX-UPSTREAM cadabra2-disable-components-test.patch gh#kpeeters/cadabra2#212 badshah400@gmail.com -- Disable a test that crashes for unknown reasons
+Patch0:         cadabra2-disable-components-test.patch
 BuildRequires:  appstream-glib
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -52,6 +54,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
 BuildRequires:  pkgconfig(jsoncpp)
 BuildRequires:  pkgconfig(sqlite3)
+Requires:       python3
 Recommends:     %{name}-doc
 # SECTION For test
 %if %{with tests}
@@ -146,7 +149,7 @@ sed -i "1{/#!\/usr\/bin\/env python/d}" libs/appdirs/cdb_appdirs.py
   -DENABLE_FRONTEND:BOOL=ON \
   -DENABLE_SYSTEM_JSONCPP:BOOL=ON \
   -DENABLE_MATHEMATICA:BOOL=OFF \
-  -DBUILD_TESTS:BOOL=%{?_with_tests:ON}%{!?_with_tests:OFF}
+  -DBUILD_TESTS:BOOL=%{?with_tests:ON}%{!?with_tests:OFF}
 
 %cmake_build
 cd ..
@@ -168,7 +171,6 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
 
 %if %{with tests}
 %check
-export PYTHONPATH=%{buildroot}%{python3_sitearch}
 export PATH=${PATH}:%{buildroot}%{_bindir}
 export PYTHONDONTWRITEBYTECODE=1
 %ctest
@@ -182,14 +184,15 @@ export PYTHONDONTWRITEBYTECODE=1
 %{_bindir}/cadabra-server
 %{_bindir}/%{name}
 %{_bindir}/%{name}-cli
+%{_bindir}/%{name}ipynb
 %{_bindir}/%{name}python
 %{_bindir}/%{name}html
 %{_datadir}/%{name}/
 %{_datadir}/texmf
-%{python3_sitearch}/cadabra2.so
-%{python3_sitearch}/cadabra2_defaults.py
-%{python3_sitearch}/cdb_appdirs.py
-%{python3_sitearch}/cdb/
+%{python3_sitelib}/cadabra2*.so
+%{python3_sitelib}/cadabra2_defaults.py
+%{python3_sitelib}/cdb_appdirs.py
+%{python3_sitelib}/cdb/
 %{_mandir}/man1/cadabra*.1%{?ext_man}
 
 %files gui
@@ -202,8 +205,8 @@ export PYTHONDONTWRITEBYTECODE=1
 
 %files -n jupyter-cadabra2-kernel
 %license doc/license.txt
-%{python3_sitearch}/cadabra2_jupyter/
-%{python3_sitearch}/notebook/
+%{python3_sitelib}/cadabra2_jupyter/
+%{python3_sitelib}/notebook/
 %{_jupyter_kernel_dir}/cadabra2/
 
 %files examples