diff --git a/pkgs/racket-test-core/tests/racket/path.rktl b/pkgs/racket-test-core/tests/racket/path.rktl
index 0ebbcf08ee..eb2bb9b797 100644
--- a/pkgs/racket-test-core/tests/racket/path.rktl
+++ b/pkgs/racket-test-core/tests/racket/path.rktl
@@ -461,6 +461,10 @@
 (arity-test expand-user-path 1 1)
 (arity-test resolve-path 1 1)
 
+(when (eq? 'unix (system-path-convention-type))
+  (test #t complete-path? (expand-user-path "~/something"))
+  (test #t complete-path? (expand-user-path (string->path "~/something"))))
+
 (map
  (lambda (f)
    (err/rt-test (f (string #\a #\nul #\b)) exn:fail:contract?))
diff --git a/racket/src/racket/src/file.c b/racket/src/racket/src/file.c
index 3408279556..1492e7e727 100644
--- a/racket/src/racket/src/file.c
+++ b/racket/src/racket/src/file.c
@@ -1678,6 +1678,8 @@ static char *do_expand_filename(Scheme_Object *o, char* filename, int ilen, cons
 
       filename = scheme_strdup_and_free(new_filename);
       ilen = strlen(filename);
+      if (expanded)
+        *expanded = 1;
     }
 #endif