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 860fc38c776..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,7 +1,6 @@
 package io.swagger.codegen;
 
 import io.swagger.codegen.languages.JavaClientCodegen;
-import io.swagger.codegen.languages.RubyClientCodegen;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
 import org.apache.commons.io.FileUtils;
@@ -222,32 +221,6 @@ public class DefaultGeneratorTest {
         }
     }
 
-    @Test
-    public void testGenerateRubyClientWithHtmlEntity() throws Exception {
-        final File output = folder.getRoot();
-
-        final Swagger swagger = new SwaggerParser().read("src/test/resources/2_0/pathWithHtmlEntity.yaml");
-        CodegenConfig codegenConfig = new RubyClientCodegen();
-        codegenConfig.setOutputDir(output.getAbsolutePath());
-
-        ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
-
-        DefaultGenerator generator = new DefaultGenerator();
-        generator.opts(clientOptInput);
-        List<File> files = generator.generate();
-        boolean apiFileGenerated = false;
-        for (File file : files) {
-          if (file.getName().equals("default_api.rb")) {
-            apiFileGenerated = true;
-            // Ruby client should set the path unescaped in the api file
-            assertTrue(FileUtils.readFileToString(file, StandardCharsets.UTF_8).contains("local_var_path = \"/foo=bar\""));
-          }
-        }
-        if (!apiFileGenerated) {
-          fail("Default api file is not generated!");
-        }
-    }
-
     private static void changeContent(File file) throws IOException {
         Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF_8));
         out.write(TEST_SKIP_OVERWRITE);
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientCodegenTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientCodegenTest.java
new file mode 100644
index 00000000000..40b7e8dc55b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientCodegenTest.java
@@ -0,0 +1,67 @@
+package io.swagger.codegen.ruby;
+
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.languages.RubyClientCodegen;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.rules.TemporaryFolder;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import static org.junit.Assert.fail;
+import static org.testng.Assert.*;
+
+/**
+ * Tests for RubyClientCodegen-generated templates
+ */
+public class RubyClientCodegenTest {
+
+  public TemporaryFolder folder = new TemporaryFolder();
+
+  @BeforeMethod
+  public void setUp() throws Exception {
+      folder.create();
+  }
+
+  @AfterMethod
+  public void tearDown() throws Exception {
+      folder.delete();
+  }
+
+  @Test
+  public void testGenerateRubyClientWithHtmlEntity() throws Exception {
+      final File output = folder.getRoot();
+
+      final Swagger swagger = new SwaggerParser().read("src/test/resources/2_0/pathWithHtmlEntity.yaml");
+      CodegenConfig codegenConfig = new RubyClientCodegen();
+      codegenConfig.setOutputDir(output.getAbsolutePath());
+
+      ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
+
+      DefaultGenerator generator = new DefaultGenerator();
+      generator.opts(clientOptInput);
+      List<File> files = generator.generate();
+      boolean apiFileGenerated = false;
+      for (File file : files) {
+        if (file.getName().equals("default_api.rb")) {
+          apiFileGenerated = true;
+          // Ruby client should set the path unescaped in the api file
+          assertTrue(FileUtils.readFileToString(file, StandardCharsets.UTF_8).contains("local_var_path = \"/foo=bar\""));
+        }
+      }
+      if (!apiFileGenerated) {
+        fail("Default api file is not generated!");
+      }
+  }
+
+}