diff --git a/tests/migrations/from-classic.scm b/tests/migrations/from-classic.scm
index b473d702a..2033a4a77 100755
--- a/tests/migrations/from-classic.scm
+++ b/tests/migrations/from-classic.scm
@@ -1,61 +1,61 @@
 #!/usr/bin/env gpgscm
 
 ;; Copyright (C) 2016 g10 Code GmbH
 ;;
 ;; This file is part of GnuPG.
 ;;
 ;; GnuPG is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3 of the License, or
 ;; (at your option) any later version.
 ;;
 ;; GnuPG is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 (load (in-srcdir "tests" "migrations" "common.scm"))
 
 (catch (skip "gpgtar not built")
        (call-check `(,GPGTAR --help)))
 
 (define (trigger-migration)
   (call-check `(,@GPG --list-secret-keys)))
 
 (define (assert-migrated)
-  (unless (file-exists? ".gpg-v21-migrated")
+  (unless (or (file-exists? ".gpg-v21-migrated") (file-exists? "gpg-v21-migrated"))
 	  (error "Not migrated"))
 
   (for-each
    (lambda (keyid)
      (catch (error "Key not found:" keyid)
 	    (call-check `(,@GPG --list-secret-keys ,keyid))))
    '("D74C5F22" "C40FDECF" "ECABF51D")))
 
 (run-test
  "Testing a clean migration ..."
  (in-srcdir "tests" "migrations" "from-classic.tar.asc")
  (lambda (gpghome)
    (trigger-migration)
    (assert-migrated)))
 
 (run-test
  "Testing a migration with existing private-keys-v1.d ..."
  (in-srcdir "tests" "migrations" "from-classic.tar.asc")
  (lambda (gpghome)
    (mkdir "private-keys-v1.d" "-rwx")
    (trigger-migration)
    (assert-migrated)))
 
 (run-test
  "Testing a migration with existing but weird private-keys-v1.d ..."
  (in-srcdir "tests" "migrations" "from-classic.tar.asc")
  (lambda (gpghome)
    (mkdir "private-keys-v1.d" "")
    (trigger-migration)
    (assert-migrated)))
 
 ;; XXX Check a case where the migration fails.