diff --git a/.travis.yml b/.travis.yml
index 31f85ade3d..68fb32dae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,7 @@ env:
     - PX4_AWS_BUCKET=px4-travis
 
 script:
-  #- make check_format
+  - make check_format
   - arm-none-eabi-gcc --version
   - echo 'Building POSIX Firmware..' && echo -en 'travis_fold:start:script.1\\r'
   - make posix_sitl_simple -j4
diff --git a/Makefile b/Makefile
index 56ec849d7b..1e4546a3f7 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,9 @@ sitl_ros:
 
 # Other targets
 # --------------------------------------------------------------------
+check_format:
+	@./Tools/check_code_style.sh
+
 clean:
 	@rm -rf build_*/
 
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.cpp b/src/lib/launchdetection/CatapultLaunchMethod.cpp
index f13c7c4bfe..b5692cc7e7 100644
--- a/src/lib/launchdetection/CatapultLaunchMethod.cpp
+++ b/src/lib/launchdetection/CatapultLaunchMethod.cpp
@@ -79,7 +79,7 @@ void CatapultLaunchMethod::update(float accel_x)
 				if (motorDelay.get() > 0.0f) {
 					state = LAUNCHDETECTION_RES_DETECTED_ENABLECONTROL;
 					warnx("Launch detected: enablecontrol, waiting %8.4fs until full throttle",
-						double(motorDelay.get()));
+					      double(motorDelay.get()));
 
 				} else {
 					/* No motor delay set: go directly to enablemotors state */
diff --git a/src/modules/systemlib/param/param.c b/src/modules/systemlib/param/param.c
index 4ba9d32004..097e61e350 100644
--- a/src/modules/systemlib/param/param.c
+++ b/src/modules/systemlib/param/param.c
@@ -88,7 +88,7 @@ extern struct param_info_s	*param_info_base;
 extern struct param_info_s	*param_info_limit;
 #else
 // FIXME - start and end are reversed
-static const struct param_info_s *param_info_base = (const struct param_info_s *)&px4_parameters;
+static const struct param_info_s *param_info_base = (const struct param_info_s *) &px4_parameters;
 #endif
 
 #define	param_info_count		px4_parameters.param_count
diff --git a/src/systemcmds/param/param.c b/src/systemcmds/param/param.c
index d38a13c676..88f5197d27 100644
--- a/src/systemcmds/param/param.c
+++ b/src/systemcmds/param/param.c
@@ -445,8 +445,8 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
 
 			if (i != newval) {
 				printf("%c %s: ",
-					param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
-					param_name(param));
+				       param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
+				       param_name(param));
 				printf("curr: %ld", (long)i);
 				param_set(param, &newval);
 				printf(" -> new: %ld\n", (long)newval);
@@ -467,8 +467,8 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
 			if (f != newval) {
 #pragma GCC diagnostic pop
 				printf("%c %s: ",
-					param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
-					param_name(param));
+				       param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
+				       param_name(param));
 				printf("curr: %4.4f", (double)f);
 				param_set(param, &newval);
 				printf(" -> new: %4.4f\n", (double)newval);