diff --git a/test/commands/config/run.sh b/test/commands/config/run.sh
index bd599f1b..6a7063cd 100644
--- a/test/commands/config/run.sh
+++ b/test/commands/config/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/docker/run.sh b/test/commands/docker/run.sh
index dc9115e3..93f7642c 100644
--- a/test/commands/docker/run.sh
+++ b/test/commands/docker/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/emacs/run.sh b/test/commands/emacs/run.sh
index c63ede0f..855a9ef8 100644
--- a/test/commands/emacs/run.sh
+++ b/test/commands/emacs/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/exec/run.sh b/test/commands/exec/run.sh
index 6f5d422f..6cfd56a5 100644
--- a/test/commands/exec/run.sh
+++ b/test/commands/exec/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/global/run.sh b/test/commands/global/run.sh
index c801dd72..e0df5f44 100644
--- a/test/commands/global/run.sh
+++ b/test/commands/global/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/install/run.sh b/test/commands/install/run.sh
index 3a7f0e44..bf86f1da 100644
--- a/test/commands/install/run.sh
+++ b/test/commands/install/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/link/run.sh b/test/commands/link/run.sh
index 99b76e0d..c55866d5 100644
--- a/test/commands/link/run.sh
+++ b/test/commands/link/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/local/run.sh b/test/commands/local/run.sh
index 9ad9cbb2..9fdf3226 100644
--- a/test/commands/local/run.sh
+++ b/test/commands/local/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
@@ -87,7 +85,6 @@ eask lint regexps
 
 # Testing
 eask test activate
-eask test melpazoid
 
 # Clean up
 eask clean .eask
diff --git a/test/commands/outdated_upgrade/run.sh b/test/commands/outdated_upgrade/run.sh
index 7d8826b2..b9b8b919 100644
--- a/test/commands/outdated_upgrade/run.sh
+++ b/test/commands/outdated_upgrade/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/search/run.sh b/test/commands/search/run.sh
index 7915b926..65a51714 100644
--- a/test/commands/search/run.sh
+++ b/test/commands/search/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/test/buttercup/run.sh b/test/commands/test/buttercup/run.sh
index 8bbce869..abe96acc 100644
--- a/test/commands/test/buttercup/run.sh
+++ b/test/commands/test/buttercup/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/test/ert-runner/run.sh b/test/commands/test/ert-runner/run.sh
index 90203405..cb60ff5a 100644
--- a/test/commands/test/ert-runner/run.sh
+++ b/test/commands/test/ert-runner/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/commands/test/ert/run.sh b/test/commands/test/ert/run.sh
index 9308d084..1660683f 100644
--- a/test/commands/test/ert/run.sh
+++ b/test/commands/test/ert/run.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #