diff --git a/python/edu/course-creator-python/course-creator-python.iml b/python/edu/course-creator-python/course-creator-python.iml
index 1f8e332757fd..ff85e4d338c3 100644
--- a/python/edu/course-creator-python/course-creator-python.iml
+++ b/python/edu/course-creator-python/course-creator-python.iml
@@ -15,5 +15,6 @@
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="python-ide-community" />
     <orderEntry type="module" module-name="educational" />
+    <orderEntry type="module" module-name="python-educational" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/edu/course-creator-python/resources/META-INF/plugin.xml b/python/edu/course-creator-python/resources/META-INF/plugin.xml
index 1bb7f23ba546..baad95b66002 100644
--- a/python/edu/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/edu/course-creator-python/resources/META-INF/plugin.xml
@@ -29,6 +29,7 @@
 
   <extensions defaultExtensionNs="Edu">
     <CCLanguageManager implementationClass="com.jetbrains.edu.coursecreator.PyCCLanguageManager" language="Python"/>
+    <executeFile implementation="com.jetbrains.edu.coursecreator.PyCCRunTests"/>
   </extensions>
 
   <application-components>
diff --git a/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCRunTests.java b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCRunTests.java
new file mode 100644
index 000000000000..bbd9fe1e40a6
--- /dev/null
+++ b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCRunTests.java
@@ -0,0 +1,15 @@
+package com.jetbrains.edu.coursecreator;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.jetbrains.edu.coursecreator.actions.PyCCRunTestsAction;
+import com.jetbrains.python.edu.PyExecuteFileExtensionPoint;
+import org.jetbrains.annotations.NotNull;
+
+public class PyCCRunTests implements PyExecuteFileExtensionPoint {
+
+  @NotNull
+  public AnAction getRunAction() {
+    return new PyCCRunTestsAction();
+  }
+
+}
\ No newline at end of file
diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index ca2eabde356d..d19b2cca1a67 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -24,8 +24,9 @@
   </application-components>
 
   <extensionPoints>
-  <extensionPoint qualifiedName="PythonidEdu.executeFile" interface="com.jetbrains.python.edu.PyExecuteFileExtensionPoint"/>
+    <extensionPoint qualifiedName="Edu.executeFile" interface="com.jetbrains.python.edu.PyExecuteFileExtensionPoint"/>
   </extensionPoints>
+
   <extensions defaultExtensionNs="com.intellij">
       <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.edu.PyExecuteFileLineMarkerProvider"/>
   </extensions>
diff --git a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileExtensionPoint.java b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileExtensionPoint.java
index 1ae39738661d..7f5a077c2650 100644
--- a/python/edu/src/com/jetbrains/python/edu/PyExecuteFileExtensionPoint.java
+++ b/python/edu/src/com/jetbrains/python/edu/PyExecuteFileExtensionPoint.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 
 public interface PyExecuteFileExtensionPoint {
 
-  ExtensionPointName<PyExecuteFileExtensionPoint> EP_NAME = ExtensionPointName.create("PythonidEdu.executeFile");
+  ExtensionPointName<PyExecuteFileExtensionPoint> EP_NAME = ExtensionPointName.create("Edu.executeFile");
 
   @NotNull
   AnAction getRunAction();