diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
index ec74c1a..2b4c8be 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
@@ -112,6 +112,13 @@
     }
 
     @Test
+    public void testProjectStageAwareReplacement()
+    {
+        SettingsBean settingsBean = BeanProvider.getContextualReference(SettingsBean.class, false);
+        assertEquals("https://myapp/login.xhtml", settingsBean.getProjectStageAwareVariableValue());
+    }
+
+    @Test
     public void checkDynamicConvertedInjections() throws MalformedURLException
     {
         SettingsBean settingsBean = BeanProvider.getContextualReference(SettingsBean.class, false);
@@ -126,6 +133,7 @@
         assertEquals("value", settingsBean.getCustomSourceValue());
     }
 
+
     @Test
     public void proxy() throws MalformedURLException
     {
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
index b8848e4..cd582d2 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
@@ -109,6 +109,10 @@
     @ConfigProperty(name = "custom-source.test")
     private String customSourceValue;
 
+    @Inject
+    @ConfigProperty(name = "myapp.login.url")
+    private String projectStageAwareVariableValue;
+
     protected SettingsBean()
     {
     }
@@ -223,6 +227,11 @@
         return customSourceValue;
     }
 
+    public String getProjectStageAwareVariableValue()
+    {
+        return projectStageAwareVariableValue;
+    }
+
     public static class UrlList implements ConfigResolver.Converter<List<URL>>
     {
         @Override
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
index 28e522f..b098884 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++ b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -56,3 +56,11 @@
 
 prefix.suffix = done
 
+# test project stage aware replacement mechanism
+# Attention: Depending on whether another test did already run we might get
+# ProjectStage Production or UnitTest. So we set the same value for both now
+myapp.login.hostname=http://myapp
+myapp.login.hostname.Production=https://myapp
+myapp.login.hostname.UnitTest=https://myapp
+myapp.login.url=${myapp.login.hostname}/login.xhtml
+