diff --git a/circle.yml b/circle.yml
index 10d49be..46e7fdd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,8 +4,15 @@ machine:
 
 dependencies:
   pre:
-    # Clean out node-modules to prevent issues with circle-ci's caching.
-    - rm -rf node_modules
+    - npm install -g yarn@0.16.1
+  override:
+    - yarn install
+  post:
+    - yarn raml
+
+test:
+  override:
+    - yarn test
 
 general:
   artifacts: