diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..1729160f1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+language: node_js
+
+node_js:
+    - "0.12"
+
+sudo: false
+
+services:
+    - mongodb
+
+cache:
+    directories:
+        - node_modules
+        - $(npm config get prefix)/bin/grunt-cli
+        - $(npm config get prefix)/bin/electron-prebuilt
+
+before_script:
+    - npm install electron-prebuilt -g
+    - npm install grunt-cli -g
+
+after_failure:
+    - cat test1/logs/all-logs.log
+    - cat test2/logs/all-logs.log
+    - cat test3/logs/all-logs.log
diff --git a/src/utils.js b/src/utils.js
index 82a62c43f..7a5c7b7ea 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -125,7 +125,7 @@
       }
 
       logger.debug('Gen RSA keys...')
-      openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem' }, function (err) {
+      openssl.exec('genrsa', { 'out': utils.certDir + 'peertube.key.pem', '2048': false }, function (err) {
         if (err) {
           logger.error('Cannot create private key on this pod.', { error: err })
           return callback(err)
diff --git a/test/api/multiplePods.js b/test/api/multiplePods.js
index 81d4b06b6..511c1b975 100644
--- a/test/api/multiplePods.js
+++ b/test/api/multiplePods.js
@@ -65,7 +65,7 @@
                     done()
                   })
                 })
-            }, 1000)
+            }, 5000)
           })
       })
     })