diff --git a/.appveyor.yml b/.appveyor.yml
index 9d14a9145..f43995167 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,7 @@ environment:
     secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
 
   matrix:
-    - CONFIG: win_c_compilervs2015cxx_compilervs2015vc14
+    - CONFIG: win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14
       CONDA_INSTALL_LOCN: C:\Miniconda36-x64
 
 
diff --git a/.ci_support/linux_c_compilergcccxx_compilergxx.yaml b/.ci_support/linux_c_compilergcccxx_compilergxxtarget_platformlinux-64.yaml
similarity index 96%
rename from .ci_support/linux_c_compilergcccxx_compilergxx.yaml
rename to .ci_support/linux_c_compilergcccxx_compilergxxtarget_platformlinux-64.yaml
index d081238d8..37e864a5a 100644
--- a/.ci_support/linux_c_compilergcccxx_compilergxx.yaml
+++ b/.ci_support/linux_c_compilergcccxx_compilergxxtarget_platformlinux-64.yaml
@@ -41,6 +41,8 @@ readline:
 - '7.0'
 sqlite:
 - '3'
+target_platform:
+- linux-64
 tk:
 - '8.6'
 xz:
diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64.yaml
similarity index 96%
rename from .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml
rename to .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64.yaml
index 153c3359c..89b5a59cd 100644
--- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml
+++ b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64.yaml
@@ -41,6 +41,8 @@ readline:
 - '7.0'
 sqlite:
 - '3'
+target_platform:
+- linux-64
 tk:
 - '8.6'
 xz:
diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxx.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64.yaml
similarity index 96%
rename from .ci_support/osx_c_compilerclangcxx_compilerclangxx.yaml
rename to .ci_support/osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64.yaml
index df4486584..6bf1d884e 100644
--- a/.ci_support/osx_c_compilerclangcxx_compilerclangxx.yaml
+++ b/.ci_support/osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64.yaml
@@ -41,6 +41,8 @@ readline:
 - '7.0'
 sqlite:
 - '3'
+target_platform:
+- osx-64
 tk:
 - '8.6'
 xz:
diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64.yaml
similarity index 96%
rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml
rename to .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64.yaml
index 59679a458..dcc178a17 100644
--- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxx.yaml
+++ b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64.yaml
@@ -41,6 +41,8 @@ readline:
 - '7.0'
 sqlite:
 - '3'
+target_platform:
+- osx-64
 tk:
 - '8.6'
 xz:
diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml
similarity index 90%
rename from .ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml
rename to .ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml
index 21ff852a6..e9ef70bb3 100644
--- a/.ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml
+++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml
@@ -13,6 +13,8 @@ pin_run_as_build:
     max_pin: x
   vc:
     max_pin: x
+target_platform:
+- win-64
 vc:
 - '14'
 zip_keys:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6dac69daa..da637e8e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,11 @@
 version: 2
 
 jobs:
-  build_linux_c_compilergcccxx_compilergxx:
+  build_linux_c_compilergcccxx_compilergxxtarget_platformlinux-64:
     working_directory: ~/test
     machine: true
     environment:
-      - CONFIG: "linux_c_compilergcccxx_compilergxx"
+      - CONFIG: "linux_c_compilergcccxx_compilergxxtarget_platformlinux-64"
     steps:
       - checkout
       - run:
@@ -18,11 +18,11 @@ jobs:
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
           command: ./.circleci/run_docker_build.sh
-  build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxx:
+  build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64:
     working_directory: ~/test
     machine: true
     environment:
-      - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxx"
+      - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64"
     steps:
       - checkout
       - run:
@@ -35,12 +35,12 @@ jobs:
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
           command: ./.circleci/run_docker_build.sh
-  build_osx_c_compilerclangcxx_compilerclangxx:
+  build_osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64:
     working_directory: ~/test
     macos:
       xcode: "9.0"
     environment:
-      - CONFIG: "osx_c_compilerclangcxx_compilerclangxx"
+      - CONFIG: "osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64"
     steps:
       - checkout
       - run:
@@ -51,12 +51,12 @@ jobs:
       - run:
           # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
           command: ./.circleci/run_osx_build.sh
-  build_osx_c_compilertoolchain_ccxx_compilertoolchain_cxx:
+  build_osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64:
     working_directory: ~/test
     macos:
       xcode: "9.0"
     environment:
-      - CONFIG: "osx_c_compilertoolchain_ccxx_compilertoolchain_cxx"
+      - CONFIG: "osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64"
     steps:
       - checkout
       - run:
@@ -72,7 +72,7 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build_linux_c_compilergcccxx_compilergxx
-      - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxx
-      - build_osx_c_compilerclangcxx_compilerclangxx
-      - build_osx_c_compilertoolchain_ccxx_compilertoolchain_cxx
+      - build_linux_c_compilergcccxx_compilergxxtarget_platformlinux-64
+      - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformlinux-64
+      - build_osx_c_compilerclangcxx_compilerclangxxtarget_platformosx-64
+      - build_osx_c_compilertoolchain_ccxx_compilertoolchain_cxxtarget_platformosx-64
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index f8316eb59..8ba2ea81a 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -68,7 +68,7 @@ source:
     sha256: de3c87b26a80e789986d8e6950c6304175d3829afe9c6c7211eb7257266ab0ac         # [win]
 
 build:
-  number: 1004
+  number: 1005
   # Windows has issues updating python if conda is using files itself.
   # Copy rather than link.
   no_link:
@@ -101,6 +101,7 @@ requirements:
     - zlib              # [unix]
     - ncurses           # [linux]
     - libffi            # [unix]
+    - gdbm              # [unix]
   run:
     - openssl           # [unix]
     - readline          # [unix]
@@ -113,6 +114,10 @@ requirements:
     #- vs2015_runtime    # [win]
 
 test:
+  requires:             # [unix]
+    - gdbm              # [unix]
+  imports:              # [unix]
+    - dbm.gnu           # [unix]
   commands:
     - python -V
     - python3 -V            # [unix]