diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
index a74e652bb6d..720f2f8aa67 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
@@ -19,10 +19,14 @@ public interface CodegenConfig {
 
     Map<String, Object> additionalProperties();
 
+    String testPackage();
+
     String apiPackage();
 
     String apiFileFolder();
 
+    String apiTestFileFolder();
+
     String fileSuffix();
 
     String outputFolder();
@@ -33,6 +37,8 @@ public interface CodegenConfig {
 
     String modelFileFolder();
 
+    String modelTestFileFolder();
+
     String modelPackage();
 
     String toApiName(String name);
@@ -87,6 +93,10 @@ public interface CodegenConfig {
 
     Map<String, String> modelTemplateFiles();
 
+    Map<String, String> apiTestTemplateFiles();
+
+    Map<String, String> modelTestTemplateFiles();
+
     Set<String> languageSpecificPrimitives();
 
     void preprocessSwagger(Swagger swagger);
@@ -97,6 +107,10 @@ public interface CodegenConfig {
 
     String toModelFilename(String name);
 
+    String toApiTestFilename(String name);
+
+    String toModelTestFilename(String name);
+    
     String toModelImport(String name);
 
     String toApiImport(String name);
@@ -115,6 +129,8 @@ public interface CodegenConfig {
 
     String apiFilename(String templateName, String tag);
 
+    String apiTestFilename(String templateName, String tag);
+
     boolean shouldOverwrite(String filename);
 
     boolean isSkipOverwrite();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index abc4d045315..f9bd468a25b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -63,8 +63,11 @@ public class DefaultCodegen {
     protected Set<String> languageSpecificPrimitives = new HashSet<String>();
     protected Map<String, String> importMapping = new HashMap<String, String>();
     protected String modelPackage = "", apiPackage = "", fileSuffix;
+    protected String testPackage = "";
     protected Map<String, String> apiTemplateFiles = new HashMap<String, String>();
     protected Map<String, String> modelTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> apiTestTemplateFiles = new HashMap<String, String>();
+    protected Map<String, String> modelTestTemplateFiles = new HashMap<String, String>();
     protected String templateDir;
     protected String embeddedTemplateDir;
     protected Map<String, Object> additionalProperties = new HashMap<String, Object>();
@@ -170,6 +173,10 @@ public class DefaultCodegen {
         return importMapping;
     }
 
+    public String testPackage() {
+        return testPackage;
+    }
+
     public String modelPackage() {
         return modelPackage;
     }
@@ -194,6 +201,14 @@ public class DefaultCodegen {
         }
     }
 
+    public Map<String, String> apiTestTemplateFiles() {
+        return apiTestTemplateFiles;
+    }
+
+    public Map<String, String> modelTestTemplateFiles() {
+        return modelTestTemplateFiles;
+    }
+
     public Map<String, String> apiTemplateFiles() {
         return apiTemplateFiles;
     }
@@ -210,6 +225,14 @@ public class DefaultCodegen {
         return outputFolder + "/" + modelPackage().replace('.', '/');
     }
 
+    public String apiTestFileFolder() {
+        return outputFolder + "/" + testPackage().replace('.', '/');
+    }
+
+    public String modelTestFileFolder() {
+        return outputFolder + "/" + testPackage().replace('.', '/');
+    }
+
     public Map<String, Object> additionalProperties() {
         return additionalProperties;
     }
@@ -260,6 +283,16 @@ public class DefaultCodegen {
         return toApiName(name);
     }
 
+    /**
+     * Return the file name of the Api Test
+     * 
+     * @param name the file name of the Api
+     * @return the file name of the Api
+     */
+    public String toApiTestFilename(String name) {
+        return toApiName(name) + "Test";
+    }
+
     /**
      * Return the variable name in the Api
      * 
@@ -280,6 +313,16 @@ public class DefaultCodegen {
         return initialCaps(name);
     }
 
+    /**
+     * Return the capitalized file name of the model test
+     * 
+     * @param name the model name
+     * @return the file name of the model
+     */
+    public String toModelTestFilename(String name) {
+        return initialCaps(name) + "Test";
+    }
+
     /**
      * Return the operation ID (method name)
      * 
@@ -2028,6 +2071,19 @@ public class DefaultCodegen {
         return apiFileFolder() + '/' + toApiFilename(tag) + suffix;
     }
 
+    /**
+     * Return the full path and API test file
+     *
+     * @param templateName template name
+     * @param tag tag
+     *
+     * @return the API test file name with full path
+     */
+    public String apiTestFilename(String templateName, String tag) {
+        String suffix = apiTestTemplateFiles().get(templateName);
+        return apiTestFileFolder() + '/' + toApiTestFilename(tag) + suffix;
+    }
+
     public boolean shouldOverwrite(String filename) {
         return !(skipOverwrite && new File(filename).exists());
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 79b07f2427b..c08babd96c0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -211,6 +211,28 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                             writeToFile(filename, tmpl.execute(models));
                             files.add(new File(filename));
                         }
+
+                        // to generate model test files
+                        for (String templateName : config.modelTestTemplateFiles().keySet()) {
+                            String suffix = config.modelTestTemplateFiles().get(templateName);
+                            String filename = config.modelTestFileFolder() + File.separator + config.toModelTestFilename(name) + suffix;
+                            if (!config.shouldOverwrite(filename)) {
+                                continue;
+                            }
+                            String templateFile = getFullTemplateFile(config, templateName);
+                            String template = readTemplate(templateFile);
+                            Template tmpl = Mustache.compiler()
+                                    .withLoader(new Mustache.TemplateLoader() {
+                                        @Override
+                                        public Reader getTemplate(String name) {
+                                            return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                        }
+                                    })
+                                    .defaultValue("")
+                                    .compile(template);
+                            writeToFile(filename, tmpl.execute(models));
+                            files.add(new File(filename));
+                        }
                     } catch (Exception e) {
                         throw new RuntimeException("Could not generate model '" + name + "'", e);
                     }
@@ -288,6 +310,30 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         writeToFile(filename, tmpl.execute(operation));
                         files.add(new File(filename));
                     }
+
+                    // to generate api test files
+                    for (String templateName : config.apiTestTemplateFiles().keySet()) {
+                        String filename = config.apiTestFilename(templateName, tag);
+                        if (!config.shouldOverwrite(filename) && new File(filename).exists()) {
+                            continue;
+                        }
+
+                        String templateFile = getFullTemplateFile(config, templateName);
+                        String template = readTemplate(templateFile);
+                        Template tmpl = Mustache.compiler()
+                                .withLoader(new Mustache.TemplateLoader() {
+                                    @Override
+                                    public Reader getTemplate(String name) {
+                                        return getTemplateReader(getFullTemplateFile(config, name + ".mustache"));
+                                    }
+                                })
+                                .defaultValue("")
+                                .compile(template);
+
+                        writeToFile(filename, tmpl.execute(operation));
+                        files.add(new File(filename));
+                    }
+
                 } catch (Exception e) {
                     throw new RuntimeException("Could not generate api file for '" + tag + "'", e);
                 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
index 12e6b3ea8ed..fa5451372c5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
@@ -41,9 +41,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         outputFolder = "generated-code" + File.separator + "php";
         modelTemplateFiles.put("model.mustache", ".php");
         apiTemplateFiles.put("api.mustache", ".php");
+        modelTestTemplateFiles.put("model_test.mustache", ".php");
+        apiTestTemplateFiles.put("api_test.mustache", ".php");
         embeddedTemplateDir = templateDir = "php";
         apiPackage = invokerPackage + "\\Api";
         modelPackage = invokerPackage + "\\Model";
+        testPackage = invokerPackage + "\\Tests";
 
         reservedWords = new HashSet<String>(
                 Arrays.asList(
@@ -236,6 +239,16 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return (outputFolder + "/" + toPackagePath(modelPackage, srcBasePath));
     }
 
+    @Override
+    public String apiTestFileFolder() {
+        return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath));
+    }
+
+    @Override
+    public String modelTestFileFolder() {
+        return (outputFolder + "/" + toPackagePath(testPackage, srcBasePath));
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
@@ -364,6 +377,12 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         return toModelName(name);
     }
 
+    @Override
+    public String toModelTestFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name) + "Test";
+    }
+
     @Override
     public String toOperationId(String operationId) {
         // throw exception if method name is empty
diff --git a/modules/swagger-codegen/src/main/resources/php/api_test.mustache b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
new file mode 100644
index 00000000000..ee26ec31ff2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
@@ -0,0 +1,79 @@
+<?php
+/**
+ * {{classname}}Test
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
+namespace {{apiPackage}};
+
+use \{{invokerPackage}}\Configuration;
+use \{{invokerPackage}}\ApiClient;
+use \{{invokerPackage}}\ApiException;
+use \{{invokerPackage}}\ObjectSerializer;
+
+/**
+ * {{classname}}Test Class Doc Comment
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    {{#operation}}
+    /**
+     * Test case for {{{operationId}}}
+     *
+     * {{{summary}}}
+     *
+     */
+    public function test_{{operationId}}() {
+
+    }
+    {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/model_test.mustache b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
new file mode 100644
index 00000000000..086db341a32
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
@@ -0,0 +1,74 @@
+<?php
+{{#models}}
+{{#model}}
+/**
+ * {{classname}}Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace {{modelPackage}};
+
+/**
+ * {{classname}}Test Class Doc Comment
+ *
+ * @category    Class
+ * @description {{description}}
+ * @package     {{invokerPackage}}
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test {{classname}}
+     */
+    public function test{{classname}}() {
+
+    }
+
+}
+{{/model}}
+{{/models}}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php
new file mode 100644
index 00000000000..c6eaa55d0a5
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/CategoryTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * CategoryTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * CategoryTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class CategoryTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Category
+     */
+    public function testCategory() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php
new file mode 100644
index 00000000000..fa036c10ef1
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/OrderTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * OrderTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * OrderTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Order
+     */
+    public function testOrder() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
new file mode 100644
index 00000000000..3df47d97be1
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * PetApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * PetApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class PetApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for updatePet
+     *
+     * Update an existing pet
+     *
+     */
+    public function test_updatePet() {
+
+    }
+    
+    /**
+     * Test case for addPet
+     *
+     * Add a new pet to the store
+     *
+     */
+    public function test_addPet() {
+
+    }
+    
+    /**
+     * Test case for findPetsByStatus
+     *
+     * Finds Pets by status
+     *
+     */
+    public function test_findPetsByStatus() {
+
+    }
+    
+    /**
+     * Test case for findPetsByTags
+     *
+     * Finds Pets by tags
+     *
+     */
+    public function test_findPetsByTags() {
+
+    }
+    
+    /**
+     * Test case for getPetById
+     *
+     * Find pet by ID
+     *
+     */
+    public function test_getPetById() {
+
+    }
+    
+    /**
+     * Test case for updatePetWithForm
+     *
+     * Updates a pet in the store with form data
+     *
+     */
+    public function test_updatePetWithForm() {
+
+    }
+    
+    /**
+     * Test case for deletePet
+     *
+     * Deletes a pet
+     *
+     */
+    public function test_deletePet() {
+
+    }
+    
+    /**
+     * Test case for uploadFile
+     *
+     * uploads an image
+     *
+     */
+    public function test_uploadFile() {
+
+    }
+    
+    /**
+     * Test case for getPetByIdWithByteArray
+     *
+     * Fake endpoint to test byte array return by 'Find pet by ID'
+     *
+     */
+    public function test_getPetByIdWithByteArray() {
+
+    }
+    
+    /**
+     * Test case for addPetUsingByteArray
+     *
+     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
+     *
+     */
+    public function test_addPetUsingByteArray() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php
new file mode 100644
index 00000000000..bcfc9b85ad6
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * PetTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * PetTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class PetTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Pet
+     */
+    public function testPet() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
new file mode 100644
index 00000000000..899f5791c8a
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * StoreApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * StoreApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class StoreApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for getInventory
+     *
+     * Returns pet inventories by status
+     *
+     */
+    public function test_getInventory() {
+
+    }
+    
+    /**
+     * Test case for placeOrder
+     *
+     * Place an order for a pet
+     *
+     */
+    public function test_placeOrder() {
+
+    }
+    
+    /**
+     * Test case for getOrderById
+     *
+     * Find purchase order by ID
+     *
+     */
+    public function test_getOrderById() {
+
+    }
+    
+    /**
+     * Test case for deleteOrder
+     *
+     * Delete purchase order by ID
+     *
+     */
+    public function test_deleteOrder() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php
new file mode 100644
index 00000000000..726dacbd126
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/TagTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * TagTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * TagTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class TagTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test Tag
+     */
+    public function testTag() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php
new file mode 100644
index 00000000000..500b99c4c4f
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserApiTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * UserApiTest
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program. 
+ * https://github.com/swagger-api/swagger-codegen 
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * UserApiTest Class Doc Comment
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+class UserApiTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    
+    /**
+     * Test case for createUser
+     *
+     * Create user
+     *
+     */
+    public function test_createUser() {
+
+    }
+    
+    /**
+     * Test case for createUsersWithArrayInput
+     *
+     * Creates list of users with given input array
+     *
+     */
+    public function test_createUsersWithArrayInput() {
+
+    }
+    
+    /**
+     * Test case for createUsersWithListInput
+     *
+     * Creates list of users with given input array
+     *
+     */
+    public function test_createUsersWithListInput() {
+
+    }
+    
+    /**
+     * Test case for loginUser
+     *
+     * Logs user into the system
+     *
+     */
+    public function test_loginUser() {
+
+    }
+    
+    /**
+     * Test case for logoutUser
+     *
+     * Logs out current logged in user session
+     *
+     */
+    public function test_logoutUser() {
+
+    }
+    
+    /**
+     * Test case for getUserByName
+     *
+     * Get user by user name
+     *
+     */
+    public function test_getUserByName() {
+
+    }
+    
+    /**
+     * Test case for updateUser
+     *
+     * Updated user
+     *
+     */
+    public function test_updateUser() {
+
+    }
+    
+    /**
+     * Test case for deleteUser
+     *
+     * Delete user
+     *
+     */
+    public function test_deleteUser() {
+
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php
new file mode 100644
index 00000000000..635a91e704e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/UserTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * UserTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * UserTest Class Doc Comment
+ *
+ * @category    Class
+ * @description 
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class UserTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test User
+     */
+    public function testUser() {
+
+    }
+
+}