diff --git a/test/net/java/sip/communicator/slick/media/MediaServiceLick.java b/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
index e88fa3d52..9db93dbda 100644
--- a/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
+++ b/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
@@ -10,6 +10,7 @@
 
 import org.osgi.framework.*;
 import junit.framework.*;
+import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.media.*;
 import net.java.sip.communicator.util.*;
 
@@ -44,6 +45,16 @@ public void start(BundleContext bundleContext) throws Exception
         Hashtable properties = new Hashtable();
         properties.put("service.pid", getName());
 
+        // disable video support when testing
+        ServiceReference confReference
+            = bundleContext.getServiceReference(
+                ConfigurationService.class.getName());
+        ConfigurationService configurationService
+            = (ConfigurationService) bundleContext.getService(confReference);
+        configurationService.setProperty(
+            MediaService.DISABLE_VIDEO_SUPPORT_PROPERTY_NAME, 
+            Boolean.TRUE.toString());
+
         addTestSuite(TestMediaService.class);
         bundleContext.registerService(getClass().getName(), this, properties);
 
diff --git a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
index efec7bdca..a4c2d39a9 100644
--- a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
@@ -5,6 +5,7 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
  junit.framework,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.slick.media,
  net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,