diff --git a/cloud.spec b/cloud.spec
index f1f44b69ef4..83af1e6576d 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -248,17 +248,6 @@ Group:     System Environment/Libraries
 %description cli
 The CloudStack command line tools contain a few Python modules that can call cloudStack APIs.
 
-%package test
-Summary:   CloudStack test suite
-Requires: java >= 1.6.0
-Requires: %{name}-utils = %{version}, %{name}-deps = %{version}, wget
-Group:     System Environment/Libraries
-Obsoletes: vmops-test < %{version}-%{release}
-%description test
-The CloudStack test package contains a suite of automated tests
-that the very much appreciated CloudStack QA team constantly
-uses to help increase the quality of the CloudStack.
-
 %package usage
 Summary:   CloudStack usage monitor
 Obsoletes: vmops-usage < %{version}-%{release}
@@ -340,12 +329,6 @@ if [ -d %{_datadir}/%{name}/management/webapps/client/ ]; then
 	popd &>/dev/null
 fi
 
-%post client
-if [ "$1" == "1" ] ; then
-    /sbin/chkconfig --add %{name}-management > /dev/null 2>&1 || true
-    /sbin/chkconfig --level 345 %{name}-management on > /dev/null 2>&1 || true
-fi
-
 %preun usage
 if [ "$1" == "0" ] ; then
     /sbin/chkconfig --del %{name}-usage  > /dev/null 2>&1 || true
@@ -557,14 +540,6 @@ fi
 %files baremetal-agent
 %attr(0755,root,root) %{_bindir}/cloud-setup-baremetal
 
-%files test
-%defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_bindir}/%{name}-run-test
-%{_javadir}/%{name}-test.jar
-%{_sharedstatedir}/%{name}/test/*
-%{_libdir}/%{name}/test/*
-%config(noreplace) %{_sysconfdir}/%{name}/test/*
-
 %files usage
 %defattr(0644,root,root,0775)
 %{_javadir}/%{name}-usage.jar
diff --git a/test/bindir/cloud-run-test.in b/test/bindirbak/cloud-run-test.in
similarity index 100%
rename from test/bindir/cloud-run-test.in
rename to test/bindirbak/cloud-run-test.in
diff --git a/wscript_build b/wscript_build
index 352d68dc2c2..610a7d3eb70 100644
--- a/wscript_build
+++ b/wscript_build
@@ -404,7 +404,7 @@ build_db_files ()
 build_plugins ()
 build_xml_api_description ()
 build_ovm ()
-build_test()
+#build_test()
 build_usage_dir()
 
 # ====================== Magic! =========================================