diff --git a/main.fmf b/main.fmf
index d8dccdd..d5056fd 100644
--- a/main.fmf
+++ b/main.fmf
@@ -1,9 +1,6 @@
 contact: Vít Ondruch <vondruch@redhat.com>
-test: runtest.sh
-category: integration
-
-/run-basic-rails-application:
-    component: rubygem-rails
+test: ./runtest.sh
+framework: beakerlib
 
 /systemtap-static-probes-in-ruby:
     component: systemtap
diff --git a/run-basic-rails-application/main.fmf b/run-basic-rails-application/main.fmf
new file mode 100644
index 0000000..f5c9ba2
--- /dev/null
+++ b/run-basic-rails-application/main.fmf
@@ -0,0 +1,11 @@
+component:
+- rubygem-rails
+
+require:
+- ruby
+- ruby-devel
+- rubygem-rails
+- gcc
+- git-core
+- rubygems
+- rubypick
diff --git a/run-basic-rails-application/runtest.sh b/run-basic-rails-application/runtest.sh
index 6774bed..c6c49af 100755
--- a/run-basic-rails-application/runtest.sh
+++ b/run-basic-rails-application/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-[ -e /usr/bin/rhts-environment.sh ] && . /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGES=${PACKAGES:-ruby rubygems rubypick}
@@ -70,11 +69,6 @@ rlJournalStart
         rlRun "pushd app/"
         rlAssertExists "app"
 
-        if [[ ! "$COLLECTIONS" =~ "rh-ror50" ]]
-        then
-            rlRun "echo \"gem 'therubyracer'\" >> Gemfile" 0 "Adding therubyracer gem into Gemfile"
-            rlRun "bundle install"
-        fi
 
         if [ -z "$COLLECTIONS" ] && rlIsRHEL '<=7'
         then