diff --git a/.php_cs b/.php_cs
new file mode 100644
index 0000000..3151aa3
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,14 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests')
+;
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(false)
+    ->setRules([
+        '@PSR2' => true,
+    ])
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
index c69e7dc..7f0f4b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,8 @@ before_install:
 install:
     - travis_retry composer install --no-interaction --prefer-source
 
+before_script:
+    - php -v
+
 script:
-    - composer test
\ No newline at end of file
+    - make all
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..130a45b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+THIS := $(realpath $(lastword $(MAKEFILE_LIST)))
+HERE := $(shell dirname $(THIS))
+
+.PHONY: all fix test
+
+all: fix test
+
+fix:
+	php $(HERE)/vendor/bin/php-cs-fixer fix --config=$(HERE)/.php_cs
+
+test:
+	php $(HERE)/vendor/bin/phpunit --configuration $(HERE)/phpunit.xml
diff --git a/composer.json b/composer.json
index f408a31..6fed1ff 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,8 @@
   "require": {
     "guzzlehttp/guzzle": "^6.2.2",
     "php": ">=7.0.0",
-    "psr/http-message": "~1.0"
+    "psr/http-message": "~1.0",
+    "friendsofphp/php-cs-fixer": "^2.6"
   },
   "require-dev": {
     "phpunit/phpunit": "5.7.5",
@@ -22,8 +23,5 @@
     "psr-4": {
       "Cloudflare\\API\\": "src/"
     }
-  },
-  "scripts": {
-    "test": "phpunit"
   }
 }