diff --git a/.travis.yml b/.travis.yml
index c7df1e309..e4d835d3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,14 @@ matrix:
       env: TESTDB=SQLITE
 
 before_script:
+ - pear install pear/PHP_CodeSniffer
+ - phpenv rehash
  - ./tests/travis/before_script ~/builds/ss 
  - cd ~/builds/ss
 
 script: 
  - phpunit -c phpunit.xml.dist 
+ - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs -np framework
 
 notifications:
   irc:
diff --git a/tests/phpcs/ruleset.xml b/tests/phpcs/ruleset.xml
new file mode 100644
index 000000000..7d70c93cd
--- /dev/null
+++ b/tests/phpcs/ruleset.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="SilverStripe">
+	<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
+	
+	<!-- exclude SCSS-generated CSS files -->
+	<exclude-pattern>*/css/*</exclude-pattern>
+	<exclude-pattern>css/*</exclude-pattern>
+	
+	<!-- exclude thirdparty content -->
+	<exclude-pattern>thirdparty/*</exclude-pattern>
+	<exclude-pattern>*/jquery-changetracker/*</exclude-pattern>
+	<exclude-pattern>parsers/HTML/BBCodeParser/*</exclude-pattern>
+	
+	<!-- PHP-PEG generated file not intended for human consumption -->
+	<exclude-pattern>*/SSTemplateParser.php$</exclude-pattern>
+	
+	<rule ref="Generic.Files.LineEndings.InvalidEOLChar">
+		<severity>8</severity>
+	</rule>
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n" />
+		</properties>
+	</rule>
+	<rule ref="Generic.Files.LineLength.TooLong">
+		<severity>7</severity>
+	</rule>
+	<rule ref="Generic.Files.LineLength.MaxExceeded">
+		<severity>8</severity>
+	</rule>
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="120"/>
+			<property name="absoluteLineLimit" value="120"/>
+		</properties>
+	</rule>
+</ruleset>
+