diff --git a/.zuul.yaml b/.zuul.yaml
index 6398fb5a..486108d2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,5 +3,5 @@
       - puppet-openstack-check-jobs
       - puppet-openstack-module-unit-jobs
       - puppet-openstack-integration-jobs-all
-      - puppet-openstack-beaker-jobs
+      - puppet-openstack-litmus-jobs
       - release-notes-jobs-python3
diff --git a/README.md b/README.md
index 3eb8b352..ca589a11 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ VSwitch
 4. [Release Notes - Release notes for the project](#release-notes)
 5. [Repository - The project source code repository](#repository)
 6. [Usage - The usage of the module](#usage)
-7. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rspec)
-8. [TODO - What to do next](#todo)
+7. [TODO - What to do next](#todo)
 
 Overview
 --------
@@ -107,18 +106,6 @@ vs_config { 'array_key':
 }
 ```
 
-Beaker-Rspec
--------------
-
-This module has beaker-rspec tests
-
-To run:
-
-```shell
-bundle install
-bundle exec rspec spec/acceptance
-```
-
 TODO:
 -------------
 * OpenFlow controller settings
diff --git a/spec/acceptance/basic_vswitch_spec.rb b/spec/acceptance/basic_vswitch_spec.rb
index 00de5c01..af6e9421 100644
--- a/spec/acceptance/basic_vswitch_spec.rb
+++ b/spec/acceptance/basic_vswitch_spec.rb
@@ -11,7 +11,7 @@ describe 'basic vswitch' do
 
       include vswitch::ovs
 
-      vs_bridge { 'br-beaker':
+      vs_bridge { 'br-ci':
         ensure => present,
       }
 
@@ -27,17 +27,15 @@ describe 'basic vswitch' do
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe command('ovs-vsctl show') do
-      describe '#stdout' do
-        subject { super().stdout }
-        it { is_expected.to match /br-beaker/ }
+    it 'should have br-ci bridge' do
+      command('ovs-vsctl show') do |r|
+        expect(r.stdout).to match(/br-ci/)
       end
     end
 
-    describe command('ovs-vsctl get Open_vSwitch . external_ids:ovn-remote') do
-      describe '#stdout' do
-        subject { super().stdout }
-        it { is_expected.to match /\"tcp:127.0.0.1:2300\"/ }
+    it 'should get remote addr' do
+      command('ovs-vsctl get Open_vSwitch . external_ids:ovn-remote') do |r|
+        expect(r.stdout).to match(/\"tcp:127.0.0.1:2300\"/)
       end
     end
   end
diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
deleted file mode 100644
index 5f097e9f..00000000
--- a/spec/acceptance/nodesets/centos-70-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-server-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box: puppetlabs/centos-7.0-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 486b6a34..00000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  type: foss
diff --git a/spec/acceptance/nodesets/nodepool-bionic.yml b/spec/acceptance/nodesets/nodepool-bionic.yml
deleted file mode 100644
index ad73cc50..00000000
--- a/spec/acceptance/nodesets/nodepool-bionic.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-18.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-18.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
deleted file mode 100644
index c5528742..00000000
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-70-x64:
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-centos8.yml b/spec/acceptance/nodesets/nodepool-centos8.yml
deleted file mode 100644
index 4111da17..00000000
--- a/spec/acceptance/nodesets/nodepool-centos8.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-80-x64:
-    roles:
-      - master
-    platform: el-8-x86_64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
deleted file mode 100644
index 9fc624e2..00000000
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
deleted file mode 100644
index 99dd3187..00000000
--- a/spec/acceptance/nodesets/nodepool-xenial.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-16.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-16.04-amd64
-    hypervisor: none
-    ip: 127.0.0.1
-CONFIG:
-  type: foss
-  set_env: false
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index 8001929b..00000000
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-14.04-amd64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 9196bc99..d51dfdbf 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1 +1 @@
-require 'puppet-openstack_spec_helper/beaker_spec_helper'
+require 'puppet-openstack_spec_helper/litmus_spec_helper'