diff --git a/guix/channels.scm b/guix/channels.scm
index 9ab8cd8749f46fa31fe1933c2621052de302a6c6..0c84eed477c04a95def39253f49584b74aed2638 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -20,7 +20,6 @@
 
 (define-module (guix channels)
   #:use-module (git)
-  #:use-module (guix ci)
   #:use-module (guix git)
   #:use-module (guix git-authenticate)
   #:use-module ((guix openpgp)
diff --git a/guix/ci.scm b/guix/ci.scm
index 95325b4bfe489ecfd3cc42eec57bf54ffd0a051c..f04109112cd4abfa9041b3f02b3dfbf9a0b99c4d 100644
--- a/guix/ci.scm
+++ b/guix/ci.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -23,6 +23,8 @@ (define-module (guix ci)
   #:use-module (json)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
+  #:use-module (guix i18n)
+  #:use-module (guix diagnostics)
   #:autoload   (guix channels) (channel)
   #:export (build-product?
             build-product-id