diff --git a/awsapi-setup/setup/cloud-setup-bridge-db b/awsapi-setup/setup/cloud-setup-bridge-db
deleted file mode 100755
index 435ba5c5a1e..00000000000
--- a/awsapi-setup/setup/cloud-setup-bridge-db
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-#
-# Cloud.com Bridge DB setup script.
-#
-
-from getpass import getpass 
-from subprocess import call
-
-setup_db_dir = '/usr/share/cloud/setup/bridge/db'
-setup_db_script = 'deploy-db-bridge.sh'
-
-print 'Welcome to CloudBridge Database setup.'
-passwd = getpass('Please enter the MySQL password for root@localhost: ')
-
-call(['/bin/bash', setup_db_script, 'cloud', 'root', passwd], cwd=setup_db_dir)
diff --git a/cloud.spec b/cloud.spec
index f6fbf9f5ad5..c504c31a197 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -281,16 +281,16 @@ 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 QA team at CloudStack constantly
-uses to help increase the quality of the CloudStack Stack.
+#%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 QA team at CloudStack constantly
+#uses to help increase the quality of the CloudStack Stack.
 
 %package usage
 Summary:   CloudStack usage monitor
@@ -613,13 +613,13 @@ 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 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)
diff --git a/test/bindir/cloud-run-test.in b/test/bindir/cloud-run-test.in
deleted file mode 100755
index 68b3932b35f..00000000000
--- a/test/bindir/cloud-run-test.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-LIBS="
-commons-httpclient
-commons-httpclient-3.1
-commons-logging
-commons-logging-1.1.1
-commons-codec
-commons-codec-1.3
-log4j
-log4j-1.2.15
-cloud-test
-cloud-utils
-trilead-ssh2
-trilead-ssh2-build213
-"
-
-JAVADIR="@JAVADIR@"
-VMOPSCONF="@SYSCONFDIR@"/vmops/test
-if [ "$OSTYPE" == "cygwin" ] ; then
-  true
-else
-  set +e
-  CLASSPATH=$(build-classpath $LIBS 2>/dev/null)
-  set -e
-  CLASSPATH="$CLASSPATH":"$VMOPSCONF"
-  export CLASSPATH
-fi
-
-test="$1"
-shift || true
-if [ "$test" == "" ] ; then
-   echo usage: $0 test.to.run \<parameters...\> > /dev/stderr
-   exit 64
-fi
-java -cp "$CLASSPATH" com.cloud.test."$test" "$@"
diff --git a/wscript_build b/wscript_build
index 8495440bc25..930b0de726a 100644
--- a/wscript_build
+++ b/wscript_build
@@ -77,7 +77,7 @@ def build_jars ():
 			"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
 			"cloud-ws-commons-util-1.0.2.jar",
 			"cloud-commons-collections-3.2.1.jar", "vmware*.jar", "cloud-secstorage-extras.jar",
-			"cloud-agent-simulator.jar", "cloud-awsapi.jar"]
+			"cloud-agent-simulator.jar", "cloud-awsapi.jar", "cloud-test.jar"]
 
 	for a in jars_str:
 		if _basename (a).startswith ("cloud-") \
@@ -406,7 +406,7 @@ build_db_files ()
 build_plugins ()
 build_xml_api_description ()
 build_ovm ()
-build_test()
+#build_test()
 build_usage_dir()
 
 # ====================== Magic! =========================================