diff --git a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java
index dc2806a9b..bd3a928c5 100644
--- a/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java
+++ b/spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/NormalMapTest.java
@@ -250,11 +250,9 @@ public class NormalMapTest extends ApplicationAdapter {
 		ShaderProgram.pedantic = false;
 		if (!program.isCompiled()) throw new IllegalArgumentException("Error compiling shader: " + program.getLog());
 
-		program.begin();
+		program.bind();
 		program.setUniformi("u_texture", 0);
 		program.setUniformi("u_normals", 1);
-		program.end();
-
 		return program;
 	}
 
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TwoColorPolygonBatch.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TwoColorPolygonBatch.java
index ff0ff65d7..afdd35500 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TwoColorPolygonBatch.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TwoColorPolygonBatch.java
@@ -118,7 +118,7 @@ public class TwoColorPolygonBatch implements PolygonBatch {
 	public void begin () {
 		if (drawing) throw new IllegalStateException("end must be called before begin.");
 		Gdx.gl.glDepthMask(false);
-		shader.begin();
+		shader.bind();
 		setupMatrices();
 		drawing = true;
 	}
@@ -127,7 +127,6 @@ public class TwoColorPolygonBatch implements PolygonBatch {
 	public void end () {
 		if (!drawing) throw new IllegalStateException("begin must be called before end.");
 		if (vertexIndex > 0) flush();
-		shader.end();
 		Gdx.gl.glDepthMask(true);
 		if (isBlendingEnabled()) Gdx.gl.glDisable(GL20.GL_BLEND);
 
@@ -1384,13 +1383,10 @@ public class TwoColorPolygonBatch implements PolygonBatch {
 	@Override
 	public void setShader (ShaderProgram newShader) {
 		if (shader == newShader) return;
-		if (drawing) {
-			flush();
-			shader.end();
-		}
+		if (drawing) flush();
 		shader = newShader == null ? defaultShader : newShader;
 		if (drawing) {
-			shader.begin();
+			shader.bind();
 			setupMatrices();
 		}
 	}