diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..f50c3a3
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,48 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-28-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: Download dependencies
+          command: ./gradlew androidDependencies
+      - run:
+          name: Run Tests
+          command: ./gradlew lint test
+      - run:
+          name: Build debug apk and release apk
+          command: |
+            ./gradlew :app:assembleDebug
+            ./gradlew :app:assembleDebugAndroidTest
+      - store_artifacts:
+          path: app/build/reports
+          destination: reports
+      - store_test_results:
+          path: app/build/test-results
+  device_farm:
+    docker:
+      - image: circleci/android:api-28-alpha
+    steps:
+      - checkout
+      - run:
+          name: AWS DeviceFarm
+          command: ./gradlew :app:devicefarmUpload
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - device_farm:
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master
+                - circleci-project-setup
diff --git a/app/build.gradle b/app/build.gradle
index ee1ce7e..5df519b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,29 @@
 apply plugin: 'com.android.application'
+apply plugin: 'devicefarm'
+
+def envAccessKey = ENV_ACCESS_KEY
+def envSecretKey = ENV_SECRET_KEY
+
+devicefarm {
+    projectName "sci01445_android"
+    authentication {
+       accessKey envAccessKey
+       secretKey envSecretKey
+    }
+    // Fuzz
+    fuzz { }
+}
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "ncmbdataquick.mbaas.com.nifcloud.datastorequickstart"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -18,11 +33,12 @@ android {
     }
 }
 
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'com.google.code.gson:gson:2.3.1'
     implementation files('libs/NCMB.jar')
 }
diff --git a/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java b/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java
deleted file mode 100644
index cf09760..0000000
--- a/app/src/androidTest/java/ncmbdataquick/mbaas/com/nifcloud/datastorequickstart/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ncmbdataquick.mbaas.com.nifcloud.datastorequickstart;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a960ab3..db64d63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.3'
     }
 }