diff --git a/postgresql-odbc.spec b/postgresql-odbc.spec
index 6235363..cbf0030 100644
--- a/postgresql-odbc.spec
+++ b/postgresql-odbc.spec
@@ -1,9 +1,11 @@
+%bcond_without check
+
 %global upstream_name psqlodbc
 
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
 Version: 10.02.0000
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
 URL: http://%{upstream_name}.projects.postgresql.org/
@@ -13,8 +15,12 @@ Source0: http://ftp.postgresql.org/pub/odbc/versions/src/%{upstream_name}-%{vers
 Patch0: postgresql-odbc-09.06.0200-revert-money-fix.patch
 Patch1: postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch
 
-BuildRequires: unixODBC-devel postgresql-devel
-BuildRequires: postgresql-server
+BuildRequires: unixODBC-devel
+BuildRequires: pkgconfig(libpq)
+
+%if %{with check}
+BuildRequires: postgresql-test-rpm-macros
+%endif
 
 Provides: %upstream_name = %version-%release
 
@@ -54,10 +60,9 @@ pushd ${RPM_BUILD_ROOT}%{_libdir}
 	rm psqlodbcw.la psqlodbca.la
 popd
 
-
+%if %{with check}
 %check
-%pgtests_init
-%pgtests_start
+%postgresql_tests_run
 
 cd test && make installcheck %{_smp_mflags} || {
 	echo "=== trying to find all regression.diffs files in build directory ==="
@@ -66,7 +71,7 @@ cd test && make installcheck %{_smp_mflags} || {
 	done
 	false
 }
-
+%endif
 
 
 %post -p /sbin/ldconfig
@@ -101,6 +106,10 @@ the PostgreSQL unixODBC driver.
 
 
 %changelog
+* Fri Apr 13 2018 Pavel Raiskup <praiskup@redhat.com> - 10.02.0000-2
+- BR postgresql-test-rpm-macros
+- add %%bcond for check section
+
 * Mon Apr 02 2018 Pavel Raiskup <praiskup@redhat.com> - 10.02.0000-1
 - update to new upstream release, per announcement:
   https://www.postgresql.org/message-id/20180330143925.88CEDB40E51%40winpg.jp