dnf uses wrong release version after upgrade to Fedora 24

edit

I upgraded Fedora (Workstation edition, Gnome desktop, x86_64) from version 23 to 24 using the recommended upgrade method. However, dnf still seems to default to checking the repositories for version 23 instead of 24. If I use --releasever=24 it works as expected, but otherwise it always uses version 23. The content of /etc/redhat-release is:

Fedora release 24 (Twenty Four)

So it's not getting the version number from there. How can I make 24 the default version for dnf?

Update: the output of rpm -q fedora-release is:

fedora-release-23-1.noarch
fedora-release-24-2.noarch

The content of /etc/yum.repos.d/fedora.repo is:

[fedora]
name=Fedora $releasever - $basearch
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1
metadata_expire=14d
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False

And the content of /etc/yum.repos.d/fedora-updates.repo is:

[updates]
name=Fedora $releasever - $basearch - Updates
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=6h
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False