diff --git a/example/example_diagonalization.py b/example/example_diagonalization.py
index 4a2841b..20f1770 100644
--- a/example/example_diagonalization.py
+++ b/example/example_diagonalization.py
@@ -84,6 +84,12 @@ def test_diagonalize_hamiltonian(aiida_local_code_factory, clear_database):
     from aiida.engine import run
     import numpy as np
 
+    # Add entry point
+
+    entry_points.add(group='aiida.calculations',
+                     name='aiida-python.example.calc_diag',
+                     value=ClassThatCannotStartWithTestLastTime)
+
     executable = 'python3'
     entry_point = 'aiida-python.example.calc_diag'
 
diff --git a/setup.json b/setup.json
index a07acb4..1d2b7ee 100644
--- a/setup.json
+++ b/setup.json
@@ -15,9 +15,7 @@
     "version": "0.0.0",
     "entry_points": {
         "aiida.calculations": [
-            "aiida-python.calc = aiida_python.calc:CalcJobPython",
-            "aiida-python.example.calc_diag = example.test_diagonalization:ClassThatCannotStartWithTestLastTime",
-            "aiida-python.example.gpeval = example.dmc_optimize.gpeval:GPEval"
+            "aiida-python.calc = aiida_python.calc:CalcJobPython"
         ],
         "aiida.parsers": [
             "aiida-python.parser = aiida_python.parser:ParserPython"