diff --git a/setup.py b/setup.py
index 71f7cdf..2b65ca5 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="tutor-xqueue",
-    version=about["__package_version__"],
+    version=about["__version__"],
     url="https://docs.tutor.overhang.io/",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",
diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py
index 5f3e59d..99e36f2 100644
--- a/tutorxqueue/__about__.py
+++ b/tutorxqueue/__about__.py
@@ -1,8 +1,2 @@
 __version__ = "16.0.2"
-__package_version__ = __version__
 
-# Handle version suffix for nightly, just like tutor core.
-__version_suffix__ = ""
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
diff --git a/tutorxqueue/plugin.py b/tutorxqueue/plugin.py
index 42d9aa2..727f5ac 100644
--- a/tutorxqueue/plugin.py
+++ b/tutorxqueue/plugin.py
@@ -10,11 +10,16 @@
 import requests
 
 from tutor import config as tutor_config
+from tutor.__about__ import __version_suffix__
 from tutor import exceptions
 from tutor import hooks as tutor_hooks
 
 from .__about__ import __version__
 
+# Handle version suffix in nightly mode, just like tutor core
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+
 config = {
     "unique": {
         "AUTH_PASSWORD": "{{ 8|random_string }}",