diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/autotest/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/autotest/index.wiki
index e7ab43e2..de8ca26f 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/autotest/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/autotest/index.wiki
@@ -19,6 +19,12 @@ This documentation is intended to describe the AutoTest interface and capabiliti
 When you use AutoTest, you control things by using two components: '''[[The AutoTest Interface]]''' and '''[[The New Eiffel Test Wizard]]'''. The interface is used to access, manage, execute, and monitor tests. The New Eiffel test wizard is used to help you create new tests.
 
 
+{{Caution|At this time, AutoTest will work only for project targets in the classic Eiffel environment. This means that projects targeted to Microsoft .Net will not be able to use AutoTest.}}
+
+
+{{Recommended|During the transition to void-safe Eiffel, projects can be built using '''experimental''' mode. This mode is as stable as '''non-experimental''' mode, but includes some facilities that might break existing code in a few circumstances. However, since version 6.5, EiffelStudio itself is built in experimental mode, so '''we recommend that you use AutoTest only on projects also built using experimental mode'''. Experimental mode can be invoked by using the "-experiment" option from the command line, or on Microsoft Windows by following the '''Start''' menu path to EiffelStudio and selecting experimental mode. }}
+
+
 {{SeeAlso|<br/>[[Using AutoTest]]  }}