diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/Sanity/upstream-test-suite/main.fmf b/Sanity/upstream-test-suite/main.fmf
new file mode 100644
index 0000000..2344cce
--- /dev/null
+++ b/Sanity/upstream-test-suite/main.fmf
@@ -0,0 +1,32 @@
+summary: openblas test suite modified to run against installed libopenblas.so
+description: ''
+enabled: true
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    continue: false
+contact: Jan Houška <jhouska@redhat.com>
+component:
+  - openblas
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - openblas
+  - openblas-devel
+  - gcc
+  - gcc-gfortran
+duration: 5m
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - NoRHEL6
+  - NoRHEL7
+  - TIPpass
+  - TIPpass_Apps
+  - rhel-buildroot
+  - rhel8-CRB
+  - rhel8-buildroot
+  - rhel8-crb
+extra-nitrate: TC#0605110
+extra-summary: /CoreOS/openblas/Sanity/upstream-test-suite
+extra-task: /CoreOS/openblas/Sanity/upstream-test-suite
diff --git a/Sanity/upstream-test-suite/runtest.sh b/Sanity/upstream-test-suite/runtest.sh
index 14d5482..ade0e90 100755
--- a/Sanity/upstream-test-suite/runtest.sh
+++ b/Sanity/upstream-test-suite/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGES=${PACKAGES:-"openblas"}