diff --git a/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/GeneralFAQ.spec b/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/GeneralFAQ.spec
index 416404771f..f7c382ec33 100644
--- a/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/GeneralFAQ.spec
+++ b/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/GeneralFAQ.spec
@@ -213,13 +213,13 @@ describe "General FAQ on SARL" {
 			 * the FAQ, the reference documents, or
 			 * the [existing issues](https://github.com/sarl/sarl/issues), you
 			 * may ask the SARL developers on 
-			 * [this page](https://github.com/sarl/sarl/issues/new).
+			 * [the SARL forum](https://groups.google.com/forum/#!forum/sarl).
 			 * 
 			 * @filter(.*) 
 			 */
 			fact "Where can I ask my question?" {
 				"https://github.com/sarl/sarl/issues" should beURL _
-				"https://github.com/sarl/sarl/issues/new" should beURL _
+				"https://groups.google.com/forum/#!forum/sarl" should beURL _
 			}
 
 			/* A community driven list of useful SARL libraries, frameworks and software
diff --git a/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/RuntimeEnvironmentFAQ.spec b/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/RuntimeEnvironmentFAQ.spec
index 632e7f48fd..94bfbe4754 100644
--- a/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/RuntimeEnvironmentFAQ.spec
+++ b/docs/io.sarl.docs.suite/src/test/java/io/sarl/docs/faq/RuntimeEnvironmentFAQ.spec
@@ -244,44 +244,6 @@ describe "Runtime Environment FAQ" {
 
 		}
 
-		/*  
-		 */
-		context "Contribute to Janus" {
-
-			/* The sources of Janus are available on
-			 * [Github](https://github.com/janus-project/janusproject).
-			 * Details for getting the source code may be found on the
-			 * [official web site of Janus](http://www.janusproject.io). 
-			 * 
-			 * @filter(.*) 
-			 */
-			fact "Where are the sources of Janus?" {
-				"https://github.com/janus-project/janusproject" should beURL _
-				"http://www.janusproject.io" should beURL _
-			}
-			
-			/* Janus Core Developers use [Github](https://github.com/janus-project/janusproject)
-			 * to manage bug tracking and project workflow. 
-			 * The issues are listed on [Github](https://github.com/janus-project/janusproject/issues). 
-			 * 
-			 * @filter(.*) 
-			 */
-			fact "How can I obtain the current issues?" {
-				"https://github.com/janus-project/janusproject" should beURL _
-				"https://github.com/janus-project/janusproject/issues" should beURL _
-			}
-
-			/* You must submit your issue on 
-			 * [this page](https://github.com/janus-project/janusproject/issues/new).
-			 * 
-			 * @filter(.*) 
-			 */
-			fact "How can I report a problem or a bug in Janus components?" {
-				"https://github.com/janus-project/janusproject/issues/new" should beURL _
-			}
-
-		}
-
 		/*  
 		 */
 		context "Runtime Behavior of Janus" {
@@ -315,4 +277,44 @@ describe "Runtime Environment FAQ" {
 
 		}
 		
+		/*  
+		 */
+		context "Contribute to Janus" {
+
+			/* The sources for Janus are available inside the SARL project repository on
+			 * [Github](https://github.com/sarl/sarl/sre/io.janusproject/).
+			 * 
+			 * @filter(.*) 
+			 */
+			fact "Where are the sources for SARL?" {
+				// The checks are valid only if the macro replacements were done.
+				// The replacements are done by Maven.
+				// So, Eclipse Junit tools do not make the replacements.
+				System.getProperty("sun.java.command", "").startsWith("org.eclipse.jdt.internal.junit.").assumeFalse
+				//
+				"%website%" should beURL "!file"
+			}
+			
+			/* Janus Developers use [Github](https://github.com/sarl/sarl)
+			 * to manage bug tracking and project workflow. 
+			 * The issues are listed on [Github](https://github.com/sarl/sarl/issues). 
+			 * 
+			 * @filter(.*) 
+			 */
+			fact "How can I find the current issues?" {
+				"https://github.com/sarl/sarl" should beURL _
+				"https://github.com/sarl/sarl/issues" should beURL _
+			}
+
+			/* You should submit your issue on 
+			 * [this page](https://github.com/sarl/sarl/issues/new).
+			 * 
+			 * @filter(.*) 
+			 */
+			fact "How can I report a problem or a bug in Janus components?" {
+				"https://github.com/sarl/sarl/issues/new" should beURL _
+			}
+
+		}
+
 }