diff --git a/pkg/util/env/env_test.go b/pkg/util/env/env_test.go
index eb55a9f21db..a2d53cc998d 100644
--- a/pkg/util/env/env_test.go
+++ b/pkg/util/env/env_test.go
@@ -50,6 +50,12 @@ func TestGetEnvAsIntOrFallback(t *testing.T) {
 	key = "FLOCKER_UNSET_VAR"
 	returnVal, _ = GetEnvAsIntOrFallback(key, expected)
 	assert.Equal(expected, returnVal)
+
+	key = "FLOCKER_SET_VAR"
+	os.Setenv(key, "not-an-int")
+	returnVal, err := GetEnvAsIntOrFallback(key, 1)
+	assert.Equal(expected, returnVal)
+	assert.EqualError(err, "strconv.ParseInt: parsing \"not-an-int\": invalid syntax")
 }
 
 func TestGetEnvAsFloat64OrFallback(t *testing.T) {
@@ -65,4 +71,10 @@ func TestGetEnvAsFloat64OrFallback(t *testing.T) {
 	key = "FLOCKER_UNSET_VAR"
 	returnVal, _ = GetEnvAsFloat64OrFallback(key, 1.0)
 	assert.Equal(expected, returnVal)
+
+	key = "FLOCKER_SET_VAR"
+	os.Setenv(key, "not-a-float")
+	returnVal, err := GetEnvAsFloat64OrFallback(key, 1.0)
+	assert.Equal(expected, returnVal)
+	assert.EqualError(err, "strconv.ParseFloat: parsing \"not-a-float\": invalid syntax")
 }