diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..abeb9ab
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,19 @@
+build:
+  test:
+    image: abakpress/dind-testing
+    pull: true
+    privileged: true
+    volumes:
+      - /home/data/drone/images:/images
+      - /home/data/drone/gems:/bundle
+    environment:
+      - COMPOSE_FILE_EXT=drone
+      - RUBY_IMAGE_TAG=2.2-latest
+    commands:
+      - wrapdocker docker -v
+
+      - fetch-images
+        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+
+      - dip provision
+      - dip rspec
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f6ebcd0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-RAILS_ENV = test
-BUNDLE_VERSION = 1.11.2
-BUNDLE = RAILS_ENV=${RAILS_ENV} bundle _${BUNDLE_VERSION}_
-BUNDLE_OPTIONS = -j 2
-RSPEC = rspec
-APPRAISAL = appraisal
-
-all: test
-
-test: bundler/install appraisal/install
-	${BUNDLE} exec ${APPRAISAL} ${RSPEC} spec 2>&1
-
-bundler/install:
-	gem install bundler --version=${BUNDLE_VERSION};
-	${BUNDLE} install ${BUNDLE_OPTIONS}
-
-appraisal/install:
-	${BUNDLE} exec ${APPRAISAL} install
-
-clean:
-	rm -f Gemfile.lock
-	rm -rf gemfiles
-
diff --git a/dip.yml b/dip.yml
new file mode 100644
index 0000000..2397eb2
--- /dev/null
+++ b/dip.yml
@@ -0,0 +1,46 @@
+version: '1'
+
+environment:
+  DOCKER_RUBY_VERSION: 2.2
+  RUBY_IMAGE_TAG: 2.2-latest
+  COMPOSE_FILE_EXT: development
+  RAILS_ENV: test
+
+compose:
+  files:
+    - docker-compose.yml
+    - docker-compose.${COMPOSE_FILE_EXT}.yml
+
+interaction:
+  sh:
+    service: app
+
+  irb:
+    service: app
+    command: irb
+
+  bundle:
+    service: app
+    command: bundle
+
+  rake:
+    service: app
+    command: bundle exec rake
+
+  appraisal:
+    service: app
+    command: bundle exec appraisal
+
+  rspec:
+    service: app
+    command: bundle exec appraisal bundle exec rspec
+
+  clean:
+    service: app
+    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+
+provision:
+  - docker volume create --name bundler_data
+  - dip clean
+  - dip bundle install
+  - dip appraisal install
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
new file mode 100644
index 0000000..5631bef
--- /dev/null
+++ b/docker-compose.development.yml
@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - bundler-data:/bundle
+
+volumes:
+  bundler-data:
+    external:
+      name: bundler_data
diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml
new file mode 100644
index 0000000..1dc07bb
--- /dev/null
+++ b/docker-compose.drone.yml
@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - /bundle:/bundle
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..6878f3a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '2'
+
+services:
+  app:
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
+    environment:
+      - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
+    command: bash
diff --git a/findit.gemspec b/findit.gemspec
index 3cb53ca..352834f 100644
--- a/findit.gemspec
+++ b/findit.gemspec
@@ -25,8 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails", ">= 3.2"
   spec.add_development_dependency 'combustion', '>= 0.5'
   spec.add_development_dependency "appraisal", ">= 2.1.0"
-  spec.add_development_dependency 'pry-debugger'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'shoulda-matchers', '< 3.0.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'test-unit'
 end