diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4905a6dc..1852a028 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
       - run:
           name: Build miniforge3 image
           command: |
-            docker build -t condaforge/miniforge3 miniforge3/ubuntu
+            docker build -t condaforge/miniforge3 miniforge3
       - run:
           name: Run miniforge3 tests as root
           command: |
diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh
index efaf30ef..8b3dcac3 100755
--- a/.circleci/run_docker_build.sh
+++ b/.circleci/run_docker_build.sh
@@ -17,18 +17,22 @@ if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
     export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
 fi
 
-ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
+if [[ "${DOCKERIMAGE}" != "miniforge3" ]]; then
 
-mkdir -p "$ARTIFACTS"
-DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
-rm -f "$DONE_CANARY"
+    ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
 
-docker run -it \
-           -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
-           -e HOST_USER_ID \
-           `docker images -q condaforge/$DOCKERIMAGE` \
-           bash \
-           /home/conda/feedstock_root/.circleci/test_docker_container.sh
+    mkdir -p "$ARTIFACTS"
+    DONE_CANARY="$ARTIFACTS/conda-forge-build-done"
+    rm -f "$DONE_CANARY"
+
+    docker run -it \
+               -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
+               -e HOST_USER_ID \
+               `docker images -q condaforge/$DOCKERIMAGE` \
+               bash \
+               /home/conda/feedstock_root/.circleci/test_docker_container.sh
+
+    # verify that the end of the script was reached
+    test -f "$DONE_CANARY"
+fi
 
-# verify that the end of the script was reached
-test -f "$DONE_CANARY"
diff --git a/.travis.yml b/.travis.yml
index 9182645a..f6d53dd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,11 @@ matrix:
         - DOCKERTAG=10.2
         - CUDA_VER=10.2
 
+    - os: linux
+      env:
+        - DOCKERIMAGE=miniforge3
+        - DOCKERTAG=latest
+
 env:
   global:
     secure: "nM8OaFilQkH14wzD1S6DTGejjo3yL/q/1dpz7144Kw68s8FVqW0zsxCC6960ieokY2LutGSv16qTiIFxnRZnHPCXt7X2MhxcagX8IcMu62DWe2jgqwho0hPI65N/bQYLW1l23e9tjKQxWFZopM4Oyzm6TBqlzibTdbPuQI+YB3RBY0dlkIlupPIYtiNlLRR/HnOyyUny/hg3Z65GWeVpXhiMPqXLlfliTiQ31JgBaNuXiP3/ruSCDeyRPWx62IcPGJ1xVSXL3tvkEI2TpGVCsraKCSbgINhm3AHjQ+8ST6GPMxaOaHrKZzssKJpsZhz1dzWINXTLOQ5LrKtBVwfaevFxDmPEr9RcVlzwAAyuWugCyV4Z6NSt/j2Qqw5qGaiiDHyBH0FMmBgzlPzLZ4JKFsZ68aRkc2qV0MeN0YJRwcQ0EnXRULrcwReBztDHZwixSxqlPpQUwbRr7ne05rBjVoMTKaEhyHPO+KYSwQB1wiQgILBtlP/5ofsYc9Eb46m5JJJhJxuLythKpW9mMqd/US4rQrgEHQ/QRIRYwzGnKf/5WXV3W2o4C9QZpH5Da3J7jOLlqxIY5I+Dv9eEk7XxhT7UaEo7C9tmzjaL2D0yrzPnOnPQhMpmCVNWqdTp1eLcIASKSPbmzz8MuYB5yg48wjXWvDIRBQ6hJyuKHhNGE9k="
diff --git a/miniforge3/ubuntu/Dockerfile b/miniforge3/Dockerfile
similarity index 100%
rename from miniforge3/ubuntu/Dockerfile
rename to miniforge3/Dockerfile