diff --git a/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.cpp b/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.cpp
index 085950143e..f6d0a19b0f 100644
--- a/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.cpp
@@ -1,43 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryPluginActivator.h"
 
 #include "berryCoreTestApplication.h"
 
 #include <QtPlugin>
 
 namespace berry {
 
 org_blueberry_test_Activator::org_blueberry_test_Activator()
 {
 
 }
 
 void org_blueberry_test_Activator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(CoreTestApplication, context)
 }
 
 void org_blueberry_test_Activator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 }
 
 }
 
-Q_EXPORT_PLUGIN2(org_blueberry_test, berry::org_blueberry_test_Activator)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+  Q_EXPORT_PLUGIN2(org_blueberry_test, berry::org_blueberry_test_Activator)
+#endif
diff --git a/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.h b/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.h
index 1520a8d1c6..a01f96544e 100644
--- a/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.h
+++ b/BlueBerry/Bundles/org.blueberry.test/src/internal/berryPluginActivator.h
@@ -1,42 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYPLUGINACTIVATOR_H
 #define BERRYPLUGINACTIVATOR_H
 
 #include <ctkPluginActivator.h>
 
 namespace berry {
 
 class org_blueberry_test_Activator :
   public QObject, public ctkPluginActivator
 {
   Q_OBJECT
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+  Q_PLUGIN_METADATA(IID "org_blueberry_test")
+#endif
   Q_INTERFACES(ctkPluginActivator)
 
 public:
   org_blueberry_test_Activator();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 };
 
 typedef org_blueberry_test_Activator PluginActivator;
 
 }
 
 #endif // BERRYPLUGINACTIVATOR_H
diff --git a/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.cpp b/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.cpp
index 1135ff4e0e..00ad1a8952 100644
--- a/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.cpp
@@ -1,45 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryPluginActivator.h"
 
 #include "berryUITestApplication.h"
 #include "util/berryEmptyPerspective.h"
 
 #include <QtPlugin>
 
 namespace berry {
 
 org_blueberry_uitest_Activator::org_blueberry_uitest_Activator()
 {
 
 }
 
 void org_blueberry_uitest_Activator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(UITestApplication, context)
   BERRY_REGISTER_EXTENSION_CLASS(EmptyPerspective, context)
 }
 
 void org_blueberry_uitest_Activator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 }
 
 }
 
-Q_EXPORT_PLUGIN2(org_blueberry_uitest, berry::org_blueberry_uitest_Activator)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+  Q_EXPORT_PLUGIN2(org_blueberry_uitest, berry::org_blueberry_uitest_Activator)
+#endif
diff --git a/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.h b/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.h
index d470ebee6f..064af0d13c 100644
--- a/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.h
+++ b/BlueBerry/Bundles/org.blueberry.uitest/src/internal/berryPluginActivator.h
@@ -1,42 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYPLUGINACTIVATOR_H
 #define BERRYPLUGINACTIVATOR_H
 
 #include <ctkPluginActivator.h>
 
 namespace berry {
 
 class org_blueberry_uitest_Activator :
   public QObject, public ctkPluginActivator
 {
   Q_OBJECT
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+  Q_PLUGIN_METADATA(IID "org_blueberry_uitest")
+#endif
   Q_INTERFACES(ctkPluginActivator)
 
 public:
   org_blueberry_uitest_Activator();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 };
 
 typedef org_blueberry_uitest_Activator PluginActivator;
 
 }
 
 #endif // BERRYPLUGINACTIVATOR_H