diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 0c9e480..5c0524b 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -31,7 +31,7 @@
 
 %{!?beta:%global beta 0}
 
-%{!?test:%global test 1}
+%{!?test:%global test 0}
 %{!?upgrade:%global upgrade 1}
 %{!?plpython:%global plpython 1}
 %{!?plpython3:%global plpython3 1}
@@ -47,7 +47,7 @@
 %{!?pam:%global pam 1}
 %{!?sdt:%global sdt 1}
 %{!?selinux:%global selinux 1}
-%{!?runselftest:%global runselftest 1}
+%{!?runselftest:%global runselftest 0}
 
 # By default, patch(1) creates backup files when chunks apply with offsets.
 # Turn that off to ensure such files don't get included in RPMs.
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 11
 Version: 11.2
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -394,8 +394,10 @@ find . -type f -name .gitignore | xargs rm
 
 cd postgresql-setup-%{setup_version}
 
+sed -i 's|/etc/redhat-release;|/etc/powerel-release;|' configure
+
 %configure \
-    pgdocdir=%{_pkgdocdir} \
+    pgdocdir=%{_docdir}/%{name}/ \
     PGVERSION=%{version} \
     PGMAJORVERSION=%{majorversion} \
     NAME_DEFAULT_PREV_SERVICE=postgresql
@@ -656,9 +658,9 @@ cd postgresql-setup-%{setup_version}
 make install DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
-# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files
+# For some reason, having '%%doc %%{_docdir}/%{name}//README.rpm-dist' in %%files
 # causes FTBFS (at least on RHEL6), see rhbz#1250006.
-mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
+mv $RPM_BUILD_ROOT/%{_docdir}/%{name}//README.rpm-dist ./
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
 id              postgresql