diff --git a/__tests__/cli.test.js b/__tests__/cli.test.js
new file mode 100644
index 000000000000..19364ca08a80
--- /dev/null
+++ b/__tests__/cli.test.js
@@ -0,0 +1,21 @@
+import { spawnSync } from 'child_process'
+import fs from 'fs'
+import path from 'path'
+
+function runCli(task, options) {
+  return spawnSync('node', [`${path.join(process.cwd(), 'lib/cli.js')}`, `${task}`, ...options])
+}
+
+function pathToFixture(fixture) {
+  return path.resolve(`${__dirname}/fixtures/${fixture}`)
+}
+
+function readFixture(fixture) {
+  return fs.readFileSync(pathToFixture(fixture), 'utf8')
+}
+
+test('stdout only contains processed output', () => {
+  const expected = readFixture('tailwind-cli-output.css')
+  const result = runCli('build', [pathToFixture('tailwind-cli-input.css')])
+  expect(result.stdout.toString()).toEqual(expected)
+})
diff --git a/__tests__/fixtures/tailwind-cli-input.css b/__tests__/fixtures/tailwind-cli-input.css
new file mode 100644
index 000000000000..563d20e99ce8
--- /dev/null
+++ b/__tests__/fixtures/tailwind-cli-input.css
@@ -0,0 +1,3 @@
+body {
+  color: green;
+}
diff --git a/__tests__/fixtures/tailwind-cli-output.css b/__tests__/fixtures/tailwind-cli-output.css
new file mode 100644
index 000000000000..563d20e99ce8
--- /dev/null
+++ b/__tests__/fixtures/tailwind-cli-output.css
@@ -0,0 +1,3 @@
+body {
+  color: green;
+}
diff --git a/package-lock.json b/package-lock.json
index 69aeeec0c2e2..c54723bdf31d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bdc64e2c5b36..d3b4001e36c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
diff --git a/src/cli.js b/src/cli.js
index 18b25584e01f..5433800b6360 100755
--- a/src/cli.js
+++ b/src/cli.js
@@ -20,7 +20,7 @@ function writeStrategy(options) {
 }
 
 function buildTailwind(inputFile, config, write) {
-  console.log('Building Tailwind!')
+  console.warn('Building Tailwind!')
 
   const input = fs.readFileSync(inputFile, 'utf8')
 
@@ -28,9 +28,9 @@ function buildTailwind(inputFile, config, write) {
     .process(input, { from: inputFile })
     .then(result => {
       write(result.css)
-      console.log('Finished building Tailwind!')
+      console.warn('Finished building Tailwind!')
     })
-    .catch(error => console.log(error))
+    .catch(error => console.error(error))
 }
 
 const packageJson = require(path.resolve(__dirname, '../package.json'))
@@ -48,7 +48,7 @@ program
     }
 
     if (fs.existsSync(destination)) {
-      console.log(`Destination ${destination} already exists, aborting.`)
+      console.error(`Destination ${destination} already exists, aborting.`)
       process.exit(1)
     }
 
@@ -58,7 +58,7 @@ program
       destination,
       output.replace("require('./plugins/container')", "require('tailwindcss/plugins/container')")
     )
-    console.log(`Generated Tailwind config: ${destination}`)
+    console.warn(`Generated Tailwind config: ${destination}`)
     process.exit()
   })
 
diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js
index 70cdaa10ce79..c03dbbace5db 100644
--- a/src/lib/substituteTailwindAtRules.js
+++ b/src/lib/substituteTailwindAtRules.js
@@ -13,9 +13,13 @@ export default function(config) {
 
     css.walkAtRules('tailwind', atRule => {
       if (atRule.params === 'preflight') {
-        atRule.before(
-          postcss.parse(fs.readFileSync(`${__dirname}/../../css/preflight.css`, 'utf8'))
+        const preflightTree = postcss.parse(
+          fs.readFileSync(`${__dirname}/../../css/preflight.css`, 'utf8')
         )
+
+        preflightTree.walk(node => (node.source = atRule.source))
+
+        atRule.before(preflightTree)
         atRule.remove()
       }