diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 5e13149df..64f85b5db 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1402,7 +1402,7 @@ class StudentWorkController < ApplicationController
   end
 
   def find_or_save_student_work(is_test)
-    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: is_test).first
     if student_work.nil?
       @homework.student_works.build(
           name: params[:title],
@@ -1413,7 +1413,7 @@ class StudentWorkController < ApplicationController
       unless @homework.save
         logger.debug @homework.errors.full_messages
       else
-        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+        student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: is_test).first
       end
     end
     student_work
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a44a3bc01..6d003b5d8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -983,7 +983,7 @@ class UsersController < ApplicationController
       @user = User.current
       @homework = HomeworkCommon.find(params[:homework_id])
       @is_test = params[:is_test] == 'true'
-      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
+      @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id, is_test: @is_test).first
       if @student_work.nil?
         @student_work = StudentWork.new
       end