diff --git a/karma.conf.js b/karma.conf.js
index c346cae2..5b3f632b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -22,7 +22,7 @@ module.exports = function(config) {
       'test/unit/**/*.js'
     ],
 
-    singleRun: true,
+    //singleRun: true,
 
     browsers: [ 'PhantomJS'/*,  'Chrome' */]
   });
diff --git a/src/main/javascript/view/partials/signature.js b/src/main/javascript/view/partials/signature.js
index 7ff57b64..9048da77 100644
--- a/src/main/javascript/view/partials/signature.js
+++ b/src/main/javascript/view/partials/signature.js
@@ -2,6 +2,20 @@
 
 /* jshint -W122 */
 SwaggerUi.partials.signature = (function () {
+  var sampleDate = new Date();
+
+  var getSampleDate = function (type) {
+    var date;
+
+    switch(type) {
+      case 'date-time': date = sampleDate.toISOString(); break;
+      case 'date': date = sampleDate.toISOString().split('T')[0]; break;
+      default: date = sampleDate.toISOString().split('T')[0];
+    }
+
+    return date;
+  };
+
   var resolveSchema = function (schema) {
     if (_.isPlainObject(schema.schema)) {
       schema = resolveSchema(schema.schema);
@@ -656,8 +670,8 @@ SwaggerUi.partials.signature = (function () {
   var createXMLSample = function (name, definition) {
     var primitivesMap = {
       'string': {
-        'date': new Date(1).toISOString().split('T')[0],
-        'date-time' : new Date(1).toISOString(),
+        'date': getSampleDate('date'),
+        'date-time' : getSampleDate('date-time'),
         'default': 'string'
       },
       'integer': 1,
@@ -695,7 +709,8 @@ SwaggerUi.partials.signature = (function () {
       createJSONSample: createJSONSample,
       getParameterModelSignature: getParameterModelSignature,
       createParameterJSONSample: createParameterJSONSample,
-      createXMLSample: createXMLSample
+      createXMLSample: createXMLSample,
+      getSampleDate: getSampleDate
   };
 
 })();
diff --git a/test/unit/view/partials/signatureSpec.js b/test/unit/view/partials/signatureSpec.js
index 5abaf118..dab0dd8c 100644
--- a/test/unit/view/partials/signatureSpec.js
+++ b/test/unit/view/partials/signatureSpec.js
@@ -4,8 +4,8 @@ describe('SwaggerUi.partials.signature tests', function () {
     var sut = SwaggerUi.partials.signature;
 
     describe('method createXMLSample', function () {
-        var date = new Date(1).toISOString().split('T')[0];
-        var dateTime = new Date(1).toISOString();
+        var date = sut.getSampleDate('date');
+        var dateTime = sut.getSampleDate('date-time');
 
         describe('simple types with no xml property', function () {
             it('returns tag <tagname>string</tagname> when passing type string', function () {