diff --git a/build.gradle b/build.gradle
index 54554fb83cf..2bbcb07bd41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,8 +26,8 @@ ext {
     isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible()
     bintrayPublish = false
     // Sets release version
-    grailsVersion = '4.0.4.BUILD-SNAPSHOT'
-//    grailsVersion = '4.0.4'
+//    grailsVersion = '4.0.4.BUILD-SNAPSHOT'
+    grailsVersion = '4.0.4'
     groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.5.6"
     isBuildSnapshot = grailsVersion.endsWith(".BUILD-SNAPSHOT")
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
diff --git a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java
index 8a1f19c5d0a..aab15f6fc16 100644
--- a/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java
+++ b/grails-core/src/test/groovy/grails/util/GrailsUtilTests.java
@@ -25,8 +25,8 @@
 public class GrailsUtilTests extends TestCase {
 
     public void testGrailsVersion() {
-//        assertEquals("4.0.4", GrailsUtil.getGrailsVersion());
-        assertEquals("4.0.4.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
+        assertEquals("4.0.4", GrailsUtil.getGrailsVersion());
+//        assertEquals("4.0.4.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
     }
 
     @Override