diff --git a/bin/docker/run_metabase.sh b/bin/docker/run_metabase.sh
index c150091e8686dbc18629f37d312c761ebec48177..44b47863311864508d5cb0c51b8257b8156990a5 100755
--- a/bin/docker/run_metabase.sh
+++ b/bin/docker/run_metabase.sh
@@ -23,21 +23,21 @@ fi
 # taken from https://github.com/docker-library/postgres/blob/master/docker-entrypoint.sh
 # This is the specific function that takes the env var which has a "_FILE" at the end and transforms that into a normal env var.
 file_env() {
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-		exit 1
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local def="${2:-}"
+    if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+        exit 1
+    fi
+    local val="$def"
+    if [ "${!var:-}" ]; then
+        val="${!var}"
+    elif [ "${!fileVar:-}" ]; then
+        val="$(< "${!fileVar}")"
+    fi
+    export "$var"="$val"
+    unset "$fileVar"
 }
 
 # Here we define which env vars are the ones that will be supported with a "_FILE" ending. We started with the ones that would contain sensitive data
diff --git a/test/metabase/query_processor/pivot_test.clj b/test/metabase/query_processor/pivot_test.clj
index 127e8a609e759cb2707b86899c69a05fa3e95558..f19671a3819346c8dfd818d8bb0ffbce6c89c070 100644
--- a/test/metabase/query_processor/pivot_test.clj
+++ b/test/metabase/query_processor/pivot_test.clj
@@ -1,6 +1,7 @@
 (ns metabase.query-processor.pivot-test
   "Tests for pivot table actions for the query processor"
-  (:require [clojure.set :as set]
+  (:require [clj-time.core :as time]
+            [clojure.set :as set]
             [clojure.test :refer :all]
             [medley.core :as m]
             [metabase.api.pivots :as pivot.test-utils]
@@ -95,7 +96,7 @@
                       :filter       [:and
                                      [:= $user_id->people.source "Facebook" "Google"]
                                      [:= $product_id->products.category "Doohickey" "Gizmo"]
-                                     [:time-interval $created_at -2 :year {}]]}
+                                     [:time-interval $created_at (- 2019 (.getYear (time/now))) :year {}]]}
        :pivot-rows [0 1 2]
        :pivot-cols []})))
 
diff --git a/test/metabase/query_processor_test/implicit_joins_test.clj b/test/metabase/query_processor_test/implicit_joins_test.clj
index 52f6103ab450347c523860a2e5d785ef988c08b8..c16580f92fcac381d401e8e80cdb14d711a68c84 100644
--- a/test/metabase/query_processor_test/implicit_joins_test.clj
+++ b/test/metabase/query_processor_test/implicit_joins_test.clj
@@ -1,6 +1,7 @@
 (ns metabase.query-processor-test.implicit-joins-test
   "Tests for joins that are created automatically when an `:fk->` column is present."
-  (:require [clojure.test :refer :all]
+  (:require [clj-time.core :as time]
+            [clojure.test :refer :all]
             [metabase.driver :as driver]
             [metabase.test :as mt]))
 
@@ -157,6 +158,6 @@
                     :filter      [:and
                                   [:= $user_id->people.source "Facebook" "Google"]
                                   [:= $product_id->products.category "Doohickey" "Gizmo"]
-                                  [:time-interval $created_at -2 :year]]
+                                  [:time-interval $created_at (- 2019 (.getYear (time/now))) :year]]
                     :expressions {:pivot-grouping [:abs 0]}
                     :limit       5}))))))))