diff --git a/sflphone-common/test/pluginmanagertest.cpp b/sflphone-common/test/pluginmanagertest.cpp
index cffbf4c3bbaa7bcfe5285242b9a5fd5229f407e0..ade4a0dcbb3a4e0d44b45c44d6eb62b1ab6c6392 100644
--- a/sflphone-common/test/pluginmanagertest.cpp
+++ b/sflphone-common/test/pluginmanagertest.cpp
@@ -133,13 +133,9 @@ void PluginManagerTest::tearDown()
     delete _pm;
     _pm=0;
 
-    if (plugin)
-        delete plugin;
-
+    delete plugin;
     plugin = 0;
 
-    if (library)
-        delete library;
-
+    delete library;
     library = 0;
 }
diff --git a/sflphone-common/test/pluginmanagertest.h b/sflphone-common/test/pluginmanagertest.h
index 2a2e78bf7815452763a334dad1bed040a2ec360d..b3a2b5b68f3b0e692dcee15fef120c6152641d01 100644
--- a/sflphone-common/test/pluginmanagertest.h
+++ b/sflphone-common/test/pluginmanagertest.h
@@ -65,7 +65,11 @@ class PluginManagerTest : public CppUnit::TestCase {
     CPPUNIT_TEST_SUITE_END();
 
     public:
-        PluginManagerTest() : CppUnit::TestCase("Plugin Manager Tests") {}
+        PluginManagerTest() : CppUnit::TestCase("Plugin Manager Tests")
+            , _pm(0)
+            , library(0)
+            , plugin(0)
+        {}
         
         /*
          * Code factoring - Common resources can be initialized here.