diff --git a/.gitignore b/.gitignore
index 2a441e4..4e9d322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /*.src.rpm
 /.build-*.log
 /*/
+!/tests/
+/tests/*.retry
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..648918d
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/sap-cluster-connector.spec b/sap-cluster-connector.spec
index 661d885..e4b01be 100644
--- a/sap-cluster-connector.spec
+++ b/sap-cluster-connector.spec
@@ -25,7 +25,7 @@
 Name:		sap-cluster-connector
 Summary:	SAP cluster connector script
 Version:	3.0.1
-Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/fdanapfel/sap_cluster_connector
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -66,6 +66,11 @@ cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
 %{_datadir}/sap_cluster_connector
 
 %changelog
+* Tue Jun 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-7
+- Initial build
+
+  Resolves: rhbz#1960248
+
 * Mon May 10 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-6
 - sap-cluster-connector: allow dashes/underscores in nodenames
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
new file mode 100755
index 0000000..26456d2
--- /dev/null
+++ b/tests/run_tests.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+err=0
+
+for bin in "sap_cluster_connector help"; do
+	output="$($bin 2>&1)"
+	if [ $? -ne 0 ]; then
+		echo -e "ERROR: $bin failed:\n$output"
+		err=$((err+1))
+	else
+		echo "INFO: $bin works..."
+	fi
+done
+
+if [ $err -ge 1 ]; then
+	echo -e "\nERROR: $err tests FAILED..."
+	exit 1
+fi
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..599794d
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+    - role: standard-test-basic
+      tags:
+        - classic
+        - container
+      required_packages:
+        - sap-cluster-connector
+
+      tests:
+        - subpackage_tests:
+            dir: .
+            run: ./run_tests.sh