diff --git a/array-has-fill-pointer-p.lsp b/arrays/array-has-fill-pointer-p.lsp
similarity index 98%
rename from array-has-fill-pointer-p.lsp
rename to arrays/array-has-fill-pointer-p.lsp
index fa1eed4248edd18580047a46a6bd39c198bb85e4..380a982077dbe719495bd1c809dfd4fd98d0ed4c 100644
--- a/array-has-fill-pointer-p.lsp
+++ b/arrays/array-has-fill-pointer-p.lsp
@@ -2,8 +2,6 @@
 ;;;; Author:   Paul Dietz
 ;;;; Contains: Tests of the function ARRAY-HAS-FILL-POINTER-P
 
-(in-package :cl-test)
-
 ;;; Many tests are in other files, incidental to testing of
 ;;; other things
 
@@ -52,5 +50,3 @@
 (deftest array-has-fill-pointer-p.error.4
   (signals-type-error x nil (array-has-fill-pointer-p x))
   t)
-
-
diff --git a/arrays/load.lsp b/arrays/load.lsp
index c632e9c6695bed39ac70648e1bce6c179d94597b..d5f9756885f6dd91eedae2f64785f30683631e1b 100644
--- a/arrays/load.lsp
+++ b/arrays/load.lsp
@@ -22,6 +22,7 @@
   (load "array-dimension.lsp")
   (load "array-dimensions.lsp")
   (load "array-element-type.lsp")
+  (load "array-has-fill-pointer-p.lsp")
   (load "array-in-bounds-p.lsp")
   (load "array-misc.lsp")
   (load "array-rank.lsp")