diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
index 811dbb6a2a7..bfc25b8f5cc 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
@@ -1,6 +1,5 @@
 package io.swagger.codegen;
 
-import io.swagger.codegen.config.CodegenConfigurator;
 import io.swagger.codegen.languages.JavaClientCodegen;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
@@ -165,22 +164,13 @@ public class DefaultGeneratorTest {
         final Swagger swagger = new SwaggerParser().read("src/test/resources/petstore.json");
         CodegenConfig codegenConfig = new JavaClientCodegen();
         codegenConfig.setOutputDir(output.getAbsolutePath());
-        {
-            new CodegenConfigurator().setVerbose(true).toClientOptInput();
-        }
 
         ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
 
-        final File order = new File(output, MODEL_ORDER_FILE);
-        System.out.println(""+order.getAbsolutePath()+" exists:"+order.exists());
         //generate content first time without skipOverwrite flag, so all generated files should be recorded
         new DefaultGenerator().opts(clientOptInput).generate();
-        {
-            new CodegenConfigurator().setVerbose(true).toClientOptInput();
-        }
-
-        
-        assertTrue(order.exists(),"can't find: "+order.getAbsolutePath()+" output dir is:"+ (output.getAbsolutePath())+" it exists:"+output.exists() );
+        final File order = new File(output, MODEL_ORDER_FILE);
+        assertTrue(order.exists());
 
         //change content of one file
         changeContent(order);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java
index ea9537476e6..ad84f8ca0c7 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/statichtml/StaticHtmlTagsTest.java
@@ -83,7 +83,9 @@ public class StaticHtmlTagsTest {
                     "something has been changed in code and now code bypass the mock above...");
         } finally {
             if (apisBackup!=null) {
-              System.setProperty("apis", apisBackup);
+                System.setProperty("apis", apisBackup);
+            }else{
+                System.clearProperty("apis");  
             }
         }
     }