diff --git a/samples/helloworld/spring-authorization-server-samples-helloworld.gradle b/samples/boot/minimal/spring-authorization-server-samples-boot-minimal.gradle
similarity index 100%
rename from samples/helloworld/spring-authorization-server-samples-helloworld.gradle
rename to samples/boot/minimal/spring-authorization-server-samples-boot-minimal.gradle
diff --git a/samples/helloworld/src/main/java/sample/Application.java b/samples/boot/minimal/src/main/java/sample/MinimalAuthorizationServerApplication.java
similarity index 86%
rename from samples/helloworld/src/main/java/sample/Application.java
rename to samples/boot/minimal/src/main/java/sample/MinimalAuthorizationServerApplication.java
index e376b27..276d031 100644
--- a/samples/helloworld/src/main/java/sample/Application.java
+++ b/samples/boot/minimal/src/main/java/sample/MinimalAuthorizationServerApplication.java
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package sample;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class MinimalAuthorizationServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(MinimalAuthorizationServerApplication.class, args);
     }
 }
diff --git a/samples/boot/minimal/src/test/java/sample/MinimalAuthorizationServerApplicationTests.java b/samples/boot/minimal/src/test/java/sample/MinimalAuthorizationServerApplicationTests.java
new file mode 100644
index 0000000..b996c6f
--- /dev/null
+++ b/samples/boot/minimal/src/test/java/sample/MinimalAuthorizationServerApplicationTests.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sample;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+public class MinimalAuthorizationServerApplicationTests {
+
+    @Test
+    public void loadContext(ApplicationContext context) {
+        assertThat(context).isNotNull();
+    }
+}
diff --git a/samples/helloworld/src/test/java/sample/ApplicationTest.java b/samples/helloworld/src/test/java/sample/ApplicationTest.java
deleted file mode 100644
index 2f50b8e..0000000
--- a/samples/helloworld/src/test/java/sample/ApplicationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package sample;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@SpringBootTest
-public class ApplicationTest {
-
-    @Test
-    public void loadContext(ApplicationContext context) {
-        assertThat(context).isNotNull();
-    }
-}