diff --git a/features/functional_tests.feature b/features/functional_tests.feature
deleted file mode 100644
index d17cba5..0000000
--- a/features/functional_tests.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-Feature: Openstack Clients Functional Tests
-  As admins and developers
-  We want to make sure the functional tests for openstack client libraries are succeeding
-
-  @novaclient
-  Scenario: Nova Client tests
-    Given the test package "python-novaclient-test" is installed on the controller node
-    And the package "python-novaclient" is installed on the controller node
-    And the proper cirros test image has been created
-    Then all the funtional tests for the package "python-novaclient" pass
-
diff --git a/features/step_definitions/functional_tests/functional_tests_steps.rb b/features/step_definitions/functional_tests/functional_tests_steps.rb
deleted file mode 100644
index 478f0a5..0000000
--- a/features/step_definitions/functional_tests/functional_tests_steps.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-Given(/^the test package "([^"]*)" is installed on the controller node$/) do |test_package|
-  control_node.rpm_q(test_package)
-end
-
-Given(/^the package "([^"]*)" is installed on the controller node$/) do |client_package|
-  control_node.rpm_q(client_package)
-end
-
-Given(/^the proper cirros test image has been created$/) do
-  test_image_name = "cirros-test-image-uec"
-
-  if control_node.openstack.image.list.find {|img| img.name == test_image_name }
-    control_node.openstack.image.delete(test_image_name)
-  end
-
-  @test_image = control_node.openstack.image.create(
-    test_image_name,
-    copy_from: "http://clouddata.cloud.suse.de/images/cirros-0.3.3-x86_64-uec.tar.gz",
-    container_format: :bare,
-    disk_format: :raw,
-    public: true
-  )
-
-  wait_for "Image status set 'active'", max: "60 seconds", sleep: "2 seconds" do
-    image = control_node.openstack.image.show(@test_image.id)
-    break if image.status == "active"
-  end
-end
-
-Then(/^all the funtional tests for the package "([^"]*)" pass$/) do |package_name|
-  tests_dir = "/var/lib/#{package_name}-test"
-  package_core_name = package_name.match(/python-(.+)/).captures.first
-  env = {
-    "OS_NOVACLIENT_EXEC_DIR" => "/usr/bin",
-    "OS_TEST_PATH" => "#{package_core_name}/tests/functional"
-  }
-  tests_to_run = "tests_to_run"
-  excluded_tests =
-    case package_name
-    when "python-novaclient"
-      [
-        "test_admin_dns_domains" # Does not work with neutron
-      ]
-    end
-
-  # filter out the excluded tests into a file first
-  control_node.exec!(
-    "cd #{tests_dir};
-    testr list-tests | grep -v '#{excluded_tests.join("\|")}\' > #{tests_to_run}",
-    env
-  )
-
-  # run the tests finally
-  control_node.exec!(
-    "cd #{tests_dir}; python setup.py testr --testr-args '--load-list #{tests_to_run}'",
-    env
-  )
-end
-
diff --git a/tasks/features.rake b/tasks/features.rake
index e6cd0ee..e1a6256 100644
--- a/tasks/features.rake
+++ b/tasks/features.rake
@@ -5,6 +5,5 @@ namespace :features do
     invoke_task "feature:controller"
     invoke_task "feature:users"
     invoke_task "feature:images"
-    invoke_task "test:all_clients"
   end
 end
diff --git a/tasks/features/tests.rake b/tasks/features/tests.rake
deleted file mode 100644
index 60611c1..0000000
--- a/tasks/features/tests.rake
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace :test do
-  feature_name "Openstack Clients Functional Tests"
-
-  desc "Nova client functional tests"
-  feature_task :novaclient, tags: :@novaclient
-
-  desc "Functional tests for all client libraries"
-  feature_task :all_clients
-end