diff --git a/.buckconfig b/.buckconfig
index cc1b6556849daf..934256cb29d4a3 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -4,5 +4,3 @@
 
 [maven_repositories]
   central = https://repo1.maven.org/maven2
-
-
diff --git a/.buckjavaargs b/.buckjavaargs
new file mode 100644
index 00000000000000..11452478196f70
--- /dev/null
+++ b/.buckjavaargs
@@ -0,0 +1 @@
+-Xmx512m -XX:+HeapDumpOnOutOfMemoryError
diff --git a/circle.yml b/circle.yml
index ee9901bbf112b4..b0ea6e9902b3d3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -41,7 +41,7 @@ test:
     - source scripts/circle-ci-android-setup.sh && waitForAVD
   override:
     # buck tests
-    - buck/bin/buck test ReactAndroid/src/test/...
+    - buck/bin/buck test ReactAndroid/src/test/... --config build.threads=1
     - buck/bin/buck build ReactAndroid/src/main/java/com/facebook/react
     - buck/bin/buck build ReactAndroid/src/main/java/com/facebook/react/shell
     # temp, we can't run instrumentation tests yet
@@ -49,6 +49,7 @@ test:
 
     # unit tests
     - ./gradlew :ReactAndroid:testDebugUnitTest -PdisablePreDex
+
     # build JS bundle for instrumentation tests
     - node local-cli/cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/androidTest/assets/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
     # run tests on the emulator