diff --git a/.travis.yml b/.travis.yml
index c7da2903f..3909d9929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,7 +190,7 @@ jobs:
     - &exasol
       stage: ☀️ Exasol
       if: branch = master
-      env: EXASOL=6.1.0-d1
+      env: EXASOL=6.1.1-d1
       before_install:
         - source dev/linux-exasol
         - source dev/linux-prereqs
diff --git a/Changes b/Changes
index 3a53777fd..77fd8b440 100644
--- a/Changes
+++ b/Changes
@@ -29,6 +29,8 @@ Revision history for Perl extension App::Sqitch
      - Fixed an issue with command argument parsing so that it truly never
        returns a target without an engine specified, as documented.
      - Removed documentation for methods that don't exist.
+     - Fixed test failures due to a change in Encode v2.99 that's stricter
+       about `undef` arguments that should be defined.
 
      [Improvements]
      - The Snowflake engine now consults the `connections.warehousename`,
diff --git a/lib/App/Sqitch.pm b/lib/App/Sqitch.pm
index a1cac83c3..368519a23 100644
--- a/lib/App/Sqitch.pm
+++ b/lib/App/Sqitch.pm
@@ -28,7 +28,7 @@ our $VERSION = '0.9999';
 BEGIN {
     # Force Locale::TextDomain to encode in UTF-8 and to decode all messages.
     $ENV{OUTPUT_CHARSET} = 'UTF-8';
-    bind_textdomain_filter 'App-Sqitch' => \&Encode::decode_utf8;
+    bind_textdomain_filter 'App-Sqitch' => \&Encode::decode_utf8, Encode::FB_DEFAULT;
 }
 
 # Okay to load Sqitch classes now that types are created.
diff --git a/lib/App/Sqitch/Command/upgrade.pm b/lib/App/Sqitch/Command/upgrade.pm
index 5df4e39e4..c04c9c7d7 100644
--- a/lib/App/Sqitch/Command/upgrade.pm
+++ b/lib/App/Sqitch/Command/upgrade.pm
@@ -43,16 +43,15 @@ sub execute {
 
     my $engine = $target->engine;
 
-
     if ($engine->needs_upgrade) {
-        $self->info( __x(
+        $self->info(__x(
             'Upgrading registry {registry} to version {version}',
             registry => $engine->registry_destination,
             version  => $engine->registry_release,
         ));
         $engine->upgrade_registry;
     } else {
-        $self->info( __x(
+        $self->info(__x(
             'Registry {registry} is up-to-date at version {version}',
             registry => $engine->registry_destination,
             version  => $engine->registry_release,