3 files changed, 16 insertions, 48 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index b0fff38..3f46d3a 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,3 +1,9 @@
+---
+expeditor:
+  defaults:
+    buildkite:
+      timeout_in_minutes: 30
+
 steps:
 
 - label: run-lint-and-specs-ruby-2.2
@@ -49,3 +55,12 @@ steps:
     executor:
       docker:
         image: ruby:2.6-stretch
+
+- label: run-specs-windows
+  command:
+    - bundle install --jobs=7 --retry=3 --without docs debug
+    - bundle exec rake
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
diff --git a/README.md b/README.md
index 82cb0a3..7c3cb20 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Mixlib::ShellOut
-[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/mixlib-shellout?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/mixlib-shellout/branch/master) [![Build Status](https://badge.buildkite.com/7051b7b35cc19076c35a6e6a9e996807b0c14475ca3f3acd86.svg)](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout)
+[![Build Status](https://badge.buildkite.com/7051b7b35cc19076c35a6e6a9e996807b0c14475ca3f3acd86.svg)](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout)
 
 **Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
 
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index e029cd2..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-version: "master-{build}"
-
-os: Windows Server 2012 R2
-platform:
-  - x64
-
-cache:
-  - vendor/bundle
-environment:
-  matrix:
-    - ruby_version: "23"
-    - ruby_version: "23-x64"
-    - ruby_version: "24-x64"
-    - ruby_version: "25-x64"
-    - ruby_version: "26-x64"
-
-clone_folder: c:\projects\mixlib-shellout
-clone_depth: 1
-skip_tags: true
-branches:
-  only:
-    - master
-
-skip_commits:
-  # version bumps by Expeditor happen as a separate commit after the merge, we can skip
-  author: Chef Expeditor
-  # if ONLY the files listed below are changed in a commit, skip
-  files:
-    - MAINTAINERS.md
-    - MAINTAINERS.toml
-    - CHANGELOG.md
-    - RELEASE_NOTES.md
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - ruby --version
-  - gem update --system
-  - gem --version
-  - gem install bundler --quiet --no-document
-  - bundler --version
-
-build_script:
-  - bundle install --jobs=7 --retry=3 --without docs development
-
-test_script:
-  - bundle exec rspec