diff --git a/SConstruct b/SConstruct
index 5c4d82479..4182d9c5a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -30,7 +30,7 @@ env = Environment(ENV=os.environ,
                             'Go': go_builder,
                             'Copier': copy_builder,
                             'Coconut': coconut_builder},
-                  tools=['gcc', 'gnulink', 'g++', 'gas', 'gfortran'])
+                  tools=['gcc', 'gnulink', 'g++', 'gas', 'gfortran', 'javac'])
 
 Export('env')
 
@@ -50,6 +50,7 @@ languages = {
     'cpp': 'cpp',
     'fortran': 'f90',
     'go': 'go',
+    'java': 'java',
     'javascript': 'js',
     'julia': 'jl',
     'lolcode': 'lol',
diff --git a/contents/stacks_and_queues/code/java/Queue.java b/contents/stacks_and_queues/code/java/QueueTest.java
similarity index 96%
rename from contents/stacks_and_queues/code/java/Queue.java
rename to contents/stacks_and_queues/code/java/QueueTest.java
index bb349ec6d..2bf8bbe33 100644
--- a/contents/stacks_and_queues/code/java/Queue.java
+++ b/contents/stacks_and_queues/code/java/QueueTest.java
@@ -43,7 +43,7 @@ interface IQueue<T> {
 }
 
 
-public class Queue<T> implements  IQueue<T> {
+class Queue<T> implements  IQueue<T> {
 
     private List<T> list;
 
diff --git a/contents/stacks_and_queues/code/java/Stack.java b/contents/stacks_and_queues/code/java/StackTest.java
similarity index 96%
rename from contents/stacks_and_queues/code/java/Stack.java
rename to contents/stacks_and_queues/code/java/StackTest.java
index 2d65a0e59..07c96d066 100644
--- a/contents/stacks_and_queues/code/java/Stack.java
+++ b/contents/stacks_and_queues/code/java/StackTest.java
@@ -42,7 +42,7 @@ interface IStack<T> {
 }
 
 
-public class Stack<T> implements IStack<T> {
+class Stack<T> implements IStack<T> {
     
     private List<T> list;
 
diff --git a/contents/stacks_and_queues/stacks_and_queues.md b/contents/stacks_and_queues/stacks_and_queues.md
index a3c46b478..60797216e 100644
--- a/contents/stacks_and_queues/stacks_and_queues.md
+++ b/contents/stacks_and_queues/stacks_and_queues.md
@@ -19,7 +19,7 @@ Here is a simple implementation of a stack:
 {% sample lang="ts" %}
 [import, lang:"typescript"](code/typescript/stack.ts)
 {% sample lang="java" %}
-[import, lang:"java"](code/java/Stack.java)
+[import, lang:"java"](code/java/StackTest.java)
 {% sample lang="rust" %}
 [import, lang:"rust"](code/rust/Stack.rs)
 {% endmethod %}
@@ -29,7 +29,7 @@ Here is a simple implementation of a queue:
 {% sample lang="ts" %}
 [import, lang:"typescript"](code/typescript/queue.ts)
 {% sample lang="java" %}
-[import, lang:"java" ](code/java/Queue.java)
+[import, lang:"java" ](code/java/QueueTest.java)
 {% sample lang="rust" %}
 [import, lang:"rust" ](code/rust/Queue.rs)
 {% endmethod %}
diff --git a/sconscripts/java_SConscript b/sconscripts/java_SConscript
new file mode 100644
index 000000000..78f87d8a4
--- /dev/null
+++ b/sconscripts/java_SConscript
@@ -0,0 +1,6 @@
+Import('files_to_compile env')
+
+for file_info in files_to_compile:
+    build_target = f'#/build/{file_info.language}/{file_info.chapter}'
+    build_result = env.Java(build_target, str(file_info.path))
+    env.Alias(str(file_info.chapter), build_result)